Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

[linux-2.6-omap-h63xx.git] / arch / arm / lib / clear_user.S

diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
index 7ff9f831b3f9375744517bfe198058cf9f102663..4d6bc71231f3a2da61bc2f88a6860ba18e074e59 100644 (file)
--- a/arch/arm/lib/clear_user.S
+++ b/arch/arm/lib/clear_user.S
@@ -12,13 +12,13 @@
 
                .text
 
-/* Prototype: int __arch_clear_user(void *addr, size_t sz)
+/* Prototype: int __clear_user(void *addr, size_t sz)
  * Purpose  : clear some user memory
  * Params   : addr - user memory address to clear
  *          : sz   - number of bytes to clear
  * Returns  : number of bytes NOT cleared
  */
-ENTRY(__arch_clear_user)
+ENTRY(__clear_user)
                stmfd   sp!, {r1, lr}
                mov     r2, #0
                cmp     r1, #4
@@ -41,12 +41,13 @@ USER(               strplt  r2, [r0], #4)
 USER(          strnebt r2, [r0], #1)
 USER(          strnebt r2, [r0], #1)
                tst     r1, #1                  @ x1 x0 x1 x0 x1 x0 x1
-USER(          strnebt r2, [r0], #1)
+USER(          strnebt r2, [r0])
                mov     r0, #0
-               LOADREGS(fd,sp!, {r1, pc})
+               ldmfd   sp!, {r1, pc}
+ENDPROC(__clear_user)
 
                .section .fixup,"ax"
                .align  0
-9001:          LOADREGS(fd,sp!, {r0, pc})
+9001:          ldmfd   sp!, {r0, pc}
                .previous