1 files changed, 7 insertions, 6 deletions

diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 4176df721bf0..1a0045abead7 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -253,21 +253,22 @@
         .endm
 
         .macro  restore_user_regs, fast = 0, offset = 0
-        ldr     r1, [sp, #\offset + S_PSR]      @ get calling cpsr
-        ldr     lr, [sp, #\offset + S_PC]!      @ get pc
+        mov     r2, sp
+        ldr     r1, [r2, #\offset + S_PSR]      @ get calling cpsr
+        ldr     lr, [r2, #\offset + S_PC]!      @ get pc
         msr     spsr_cxsf, r1                   @ save in spsr_svc
 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
         @ We must avoid clrex due to Cortex-A15 erratum #830321
-        strex   r1, r2, [sp]                    @ clear the exclusive monitor
+        strex   r1, r2, [r2]                    @ clear the exclusive monitor
 #endif
         .if     \fast
-        ldmdb   sp, {r1 - lr}^                  @ get calling r1 - lr
+        ldmdb   r2, {r1 - lr}^                  @ get calling r1 - lr
         .else
-        ldmdb   sp, {r0 - lr}^                  @ get calling r0 - lr
+        ldmdb   r2, {r0 - lr}^                  @ get calling r0 - lr
         .endif
         mov     r0, r0                          @ ARMv5T and earlier require a nop
                                                 @ after ldm {}^
-        add     sp, sp, #S_FRAME_SIZE - S_PC
+        add     sp, sp, #\offset + S_FRAME_SIZE
         movs    pc, lr                          @ return & move spsr_svc into cpsr
         .endm