Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44ce6a5e authored by Michael Neuling's avatar Michael Neuling Committed by Benjamin Herrenschmidt
Browse files

powerpc: Merge STK_REG/PARAM/FRAMESIZE 



Merge the defines of STACKFRAMESIZE, STK_REG, STK_PARAM from different
places.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 4404a9f9

arch/powerpc/include/asm/ppc_asm.h

+5 −0
Original line number Diff line number Diff line
@@ -181,6 +181,11 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR) 
#ifdef __KERNEL__

#ifdef CONFIG_PPC64



#define STACKFRAMESIZE 256

#define STK_REG(i)     (112 + ((i)-14)*8)



#define STK_PARAM(i)	(48 + ((i)-3)*8)



#define XGLUE(a,b) a##b

#define GLUE(a,b) XGLUE(a,b)

arch/powerpc/lib/checksum_64.S

+0 −3
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ _GLOBAL(csum_tcpudp_magic) 
	srwi	r3,r3,16

	blr



#define STACKFRAMESIZE 256

#define STK_REG(i)	(112 + ((i)-14)*8)



/*

 * Computes the checksum of a memory block at buff, length len,

 * and adds in "sum" (32-bit).

arch/powerpc/lib/copypage_power7.S

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
#include <asm/page.h>

#include <asm/ppc_asm.h>



#define STACKFRAMESIZE	256

#define STK_REG(i)	(112 + ((i)-14)*8)



_GLOBAL(copypage_power7)

	/*

	 * We prefetch both the source and destination using enhanced touch

arch/powerpc/lib/copyuser_power7.S

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ 
 */

#include <asm/ppc_asm.h>



#define STACKFRAMESIZE	256

#define STK_REG(i)	(112 + ((i)-14)*8)



	.macro err1

100:

	.section __ex_table,"a"

arch/powerpc/lib/memcpy_power7.S

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ 
 */

#include <asm/ppc_asm.h>



#define STACKFRAMESIZE	256

#define STK_REG(i)	(112 + ((i)-14)*8)



_GLOBAL(memcpy_power7)

#ifdef CONFIG_ALTIVEC

	cmpldi	r5,16