[ARM] 5231/1: Do not save the frame pointer in the csum_partial_copy_* functions

Since the other assembly functions do not seem to save the frame
pointer onto the stack, this patch changes the csum_partial_copy_*
functions to behave in the same way.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/lib/csumpartialcopy.S b/arch/arm/lib/csumpartialcopy.S
index 80aa2c795155468b041dec303a218744b8f75577..d03fc71fc88c9d5167290ee0d2228f5efca820ec 100644 (file)
--- a/arch/arm/lib/csumpartialcopy.S
+++ b/arch/arm/lib/csumpartialcopy.S
@@ -18,13 +18,11 @@
  */
 
                .macro  save_regs
-               mov     ip, sp
-               stmfd   sp!, {r1, r4 - r8, fp, ip, lr, pc}
-               sub     fp, ip, #4
+               stmfd   sp!, {r1, r4 - r8, lr}
                .endm
 
                .macro  load_regs
-               ldmfd   sp, {r1, r4 - r8, fp, sp, pc}
+               ldmfd   sp!, {r1, r4 - r8, pc}
                .endm
 
                .macro  load1b, reg1

diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
index e8b9c24551c28156559a9ff4ed5a4861345ccd70..14677fb4b0c4f504bc09ba19e2dcc5acd3362393 100644 (file)
--- a/arch/arm/lib/csumpartialcopyuser.S
+++ b/arch/arm/lib/csumpartialcopyuser.S
@@ -18,13 +18,11 @@
                .text
 
                .macro  save_regs
-               mov     ip, sp
-               stmfd   sp!, {r1 - r2, r4 - r8, fp, ip, lr, pc}
-               sub     fp, ip, #4
+               stmfd   sp!, {r1, r2, r4 - r8, lr}
                .endm
 
                .macro  load_regs
-               ldmfd   sp, {r1, r2, r4-r8, fp, sp, pc}
+               ldmfd   sp!, {r1, r2, r4 - r8, pc}
                .endm
 
                .macro  load1b, reg1