Merge branch 'linus' into x86/memory-corruption-check

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

diff --git a/arch/arm/lib/csumpartialcopy.S b/arch/arm/lib/csumpartialcopy.S
index 21effe0..d03fc71 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
@@ -50,5 +48,6 @@
                .endm
 
 #define FN_ENTRY       ENTRY(csum_partial_copy_nocheck)
+#define FN_EXIT                ENDPROC(csum_partial_copy_nocheck)
 
 #include "csumpartialcopygeneric.S"