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

1 files changed, 4 insertions, 2 deletions

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