Merge master.kernel.org:/home/rmk/linux-2.6-arm

1 files changed, 5 insertions, 3 deletions

diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
index 333bca292de9..c3b93e22ea25 100644
--- a/arch/arm/lib/csumpartialcopyuser.S
+++ b/arch/arm/lib/csumpartialcopyuser.S
@@ -18,11 +18,13 @@
                 .text
 
                 .macro  save_regs
+                mov     ip, sp
                 stmfd   sp!, {r1 - r2, r4 - r8, fp, ip, lr, pc}
+                sub     fp, ip, #4
                 .endm
 
-                .macro  load_regs,flags
-                ldm\flags       fp, {r1, r2, r4-r8, fp, sp, pc}
+                .macro  load_regs
+                ldmfd   sp, {r1, r2, r4-r8, fp, sp, pc}
                 .endm
 
                 .macro  load1b, reg1
@@ -100,5 +102,5 @@
 6002:           teq     r2, r1
                 strneb  r0, [r1], #1
                 bne     6002b
-                load_regs       ea
+                load_regs
                 .previous