3 files changed, 4 insertions, 18 deletions

diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S
index 629cc8775276..35649f04fcac 100644
--- a/arch/arm/lib/strncpy_from_user.S
+++ b/arch/arm/lib/strncpy_from_user.S
@@ -21,7 +21,6 @@
  *  -EFAULT on exception, or "len" if we fill the whole buffer
  */
 ENTRY(__arch_strncpy_from_user)
-        save_lr
         mov     ip, r1
 1:      subs    r2, r2, #1
 USER(   ldrplbt r3, [r1], #1)
@@ -31,13 +30,13 @@ USER(	ldrplbt	r3, [r1], #1)
         bne     1b
         sub     r1, r1, #1      @ take NUL character out of count
 2:      sub     r0, r1, ip
-        restore_pc
+        mov     pc, lr
 
         .section .fixup,"ax"
         .align  0
 9001:   mov     r3, #0
         strb    r3, [r0, #0]    @ null terminate
         mov     r0, #-EFAULT
-        restore_pc
+        mov     pc, lr
         .previous
 
diff --git a/arch/arm/lib/strnlen_user.S b/arch/arm/lib/strnlen_user.S
index 67bcd8268128..3668a15991ef 100644
--- a/arch/arm/lib/strnlen_user.S
+++ b/arch/arm/lib/strnlen_user.S
@@ -21,7 +21,6 @@
  *            or zero on exception, or n + 1 if too long
  */
 ENTRY(__arch_strnlen_user)
-        save_lr
         mov     r2, r0
 1:
 USER(   ldrbt   r3, [r0], #1)
@@ -31,10 +30,10 @@ USER(	ldrbt	r3, [r0], #1)
         bne     1b
         add     r0, r0, #1
 2:      sub     r0, r0, r2
-        restore_pc
+        mov     pc, lr
 
         .section .fixup,"ax"
         .align  0
 9001:   mov     r0, #0
-        restore_pc
+        mov     pc, lr
         .previous
diff --git a/include/asm-arm/assembler.h b/include/asm-arm/assembler.h
index add451ab8947..b97cb3e1ba72 100644
--- a/include/asm-arm/assembler.h
+++ b/include/asm-arm/assembler.h
@@ -100,18 +100,6 @@
         msr     cpsr_c, \oldcpsr
         .endm
 
-/*
- * These two are used to save LR/restore PC over a user-based access.
- * The old 26-bit architecture requires that we do.  On 32-bit
- * architecture, we can safely ignore this requirement.
- */
-        .macro  save_lr
-        .endm
-
-        .macro  restore_pc
-        mov     pc, lr
-        .endm
-
 #define USER(x...)                              \
 9999:   x;                                      \
         .section __ex_table,"a";                \