Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[safe/jmp/linux-2.6] / arch / arm / lib / strnlen_user.S

diff --git a/arch/arm/lib/strnlen_user.S b/arch/arm/lib/strnlen_user.S
index 67bcd82..0ecbb45 100644 (file)
--- a/arch/arm/lib/strnlen_user.S
+++ b/arch/arm/lib/strnlen_user.S
@@ -14,27 +14,27 @@
        .text
        .align  5
 
-/* Prototype: unsigned long __arch_strnlen_user(const char *str, long n)
+/* Prototype: unsigned long __strnlen_user(const char *str, long n)
  * Purpose  : get length of a string in user memory
  * Params   : str - address of string in user memory
  * Returns  : length of string *including terminator*
  *           or zero on exception, or n + 1 if too long
  */
-ENTRY(__arch_strnlen_user)
-       save_lr
+ENTRY(__strnlen_user)
        mov     r2, r0
 1:
-USER(  ldrbt   r3, [r0], #1)
+       ldrusr  r3, r0, 1
        teq     r3, #0
        beq     2f
        subs    r1, r1, #1
        bne     1b
        add     r0, r0, #1
 2:     sub     r0, r0, r2
-       restore_pc
+       mov     pc, lr
+ENDPROC(__strnlen_user)
 
-       .section .fixup,"ax"
+       .pushsection .fixup,"ax"
        .align  0
 9001:  mov     r0, #0
-       restore_pc
-       .previous
+       mov     pc, lr
+       .popsection