Merge branch 'for-linus' of git://www.jni.nu/cris

[pandora-kernel.git] / arch / arm / lib / csumpartialcopyuser.S

diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
index 333bca2..14677fb 100644 (file)
--- a/arch/arm/lib/csumpartialcopyuser.S
+++ b/arch/arm/lib/csumpartialcopyuser.S
@@ -18,11 +18,11 @@
                .text
 
                .macro  save_regs
-               stmfd   sp!, {r1 - r2, r4 - r8, fp, ip, lr, pc}
+               stmfd   sp!, {r1, r2, r4 - r8, lr}
                .endm
 
-               .macro  load_regs,flags
-               ldm\flags       fp, {r1, r2, r4-r8, fp, sp, pc}
+               .macro  load_regs
+               ldmfd   sp!, {r1, r2, r4 - r8, pc}
                .endm
 
                .macro  load1b, reg1
@@ -80,6 +80,7 @@
  */
 
 #define FN_ENTRY       ENTRY(csum_partial_copy_from_user)
+#define FN_EXIT                ENDPROC(csum_partial_copy_from_user)
 
 #include "csumpartialcopygeneric.S"
 
@@ -100,5 +101,5 @@
 6002:          teq     r2, r1
                strneb  r0, [r1], #1
                bne     6002b
-               load_regs       ea
+               load_regs
                .previous