diff options
author | Michael Neuling <mikey@neuling.org> | 2012-06-25 09:33:14 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 05:18:03 -0400 |
commit | 44ce6a5ee751893ecdedbd7544c645752a5dbc01 (patch) | |
tree | 6611fafa46eedf5c134dc722163ee70bc18ee6f9 /arch/powerpc/lib | |
parent | 4404a9f98f0d426907a926c094a2dfbaa17b796d (diff) |
powerpc: Merge STK_REG/PARAM/FRAMESIZE
Merge the defines of STACKFRAMESIZE, STK_REG, STK_PARAM from different
places.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/lib')
-rw-r--r-- | arch/powerpc/lib/checksum_64.S | 3 | ||||
-rw-r--r-- | arch/powerpc/lib/copypage_power7.S | 3 | ||||
-rw-r--r-- | arch/powerpc/lib/copyuser_power7.S | 3 | ||||
-rw-r--r-- | arch/powerpc/lib/memcpy_power7.S | 3 |
4 files changed, 0 insertions, 12 deletions
diff --git a/arch/powerpc/lib/checksum_64.S b/arch/powerpc/lib/checksum_64.S index 7ca6871c11ee..167f72555d60 100644 --- a/arch/powerpc/lib/checksum_64.S +++ b/arch/powerpc/lib/checksum_64.S | |||
@@ -65,9 +65,6 @@ _GLOBAL(csum_tcpudp_magic) | |||
65 | srwi r3,r3,16 | 65 | srwi r3,r3,16 |
66 | blr | 66 | blr |
67 | 67 | ||
68 | #define STACKFRAMESIZE 256 | ||
69 | #define STK_REG(i) (112 + ((i)-14)*8) | ||
70 | |||
71 | /* | 68 | /* |
72 | * Computes the checksum of a memory block at buff, length len, | 69 | * Computes the checksum of a memory block at buff, length len, |
73 | * and adds in "sum" (32-bit). | 70 | * and adds in "sum" (32-bit). |
diff --git a/arch/powerpc/lib/copypage_power7.S b/arch/powerpc/lib/copypage_power7.S index a2126cebb957..0ef75bf0695c 100644 --- a/arch/powerpc/lib/copypage_power7.S +++ b/arch/powerpc/lib/copypage_power7.S | |||
@@ -20,9 +20,6 @@ | |||
20 | #include <asm/page.h> | 20 | #include <asm/page.h> |
21 | #include <asm/ppc_asm.h> | 21 | #include <asm/ppc_asm.h> |
22 | 22 | ||
23 | #define STACKFRAMESIZE 256 | ||
24 | #define STK_REG(i) (112 + ((i)-14)*8) | ||
25 | |||
26 | _GLOBAL(copypage_power7) | 23 | _GLOBAL(copypage_power7) |
27 | /* | 24 | /* |
28 | * We prefetch both the source and destination using enhanced touch | 25 | * We prefetch both the source and destination using enhanced touch |
diff --git a/arch/powerpc/lib/copyuser_power7.S b/arch/powerpc/lib/copyuser_power7.S index c8680c0cc3e4..f9ede7c6606e 100644 --- a/arch/powerpc/lib/copyuser_power7.S +++ b/arch/powerpc/lib/copyuser_power7.S | |||
@@ -19,9 +19,6 @@ | |||
19 | */ | 19 | */ |
20 | #include <asm/ppc_asm.h> | 20 | #include <asm/ppc_asm.h> |
21 | 21 | ||
22 | #define STACKFRAMESIZE 256 | ||
23 | #define STK_REG(i) (112 + ((i)-14)*8) | ||
24 | |||
25 | .macro err1 | 22 | .macro err1 |
26 | 100: | 23 | 100: |
27 | .section __ex_table,"a" | 24 | .section __ex_table,"a" |
diff --git a/arch/powerpc/lib/memcpy_power7.S b/arch/powerpc/lib/memcpy_power7.S index 04524a2a0b88..0efdc51bc716 100644 --- a/arch/powerpc/lib/memcpy_power7.S +++ b/arch/powerpc/lib/memcpy_power7.S | |||
@@ -19,9 +19,6 @@ | |||
19 | */ | 19 | */ |
20 | #include <asm/ppc_asm.h> | 20 | #include <asm/ppc_asm.h> |
21 | 21 | ||
22 | #define STACKFRAMESIZE 256 | ||
23 | #define STK_REG(i) (112 + ((i)-14)*8) | ||
24 | |||
25 | _GLOBAL(memcpy_power7) | 22 | _GLOBAL(memcpy_power7) |
26 | #ifdef CONFIG_ALTIVEC | 23 | #ifdef CONFIG_ALTIVEC |
27 | cmpldi r5,16 | 24 | cmpldi r5,16 |