Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

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

diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S
index 330373c..1c9814f 100644 (file)
--- a/arch/arm/lib/strncpy_from_user.S
+++ b/arch/arm/lib/strncpy_from_user.S
@@ -23,7 +23,7 @@
 ENTRY(__strncpy_from_user)
        mov     ip, r1
 1:     subs    r2, r2, #1
-USER(  ldrplbt r3, [r1], #1)
+       ldrusr  r3, r1, 1, pl
        bmi     2f
        strb    r3, [r0], #1
        teq     r3, #0