Commit 8e4971f2 authored by Anders Grafström's avatar Anders Grafström Committed by Russell King

ARM: 5991/1: Fix regression in restore_user_regs macro

ARMv5T and earlier require that a ldm {}^ instruction is not followed
by an instruction that accesses banked registers. This patch restores
the nop that was lost in commit b86040a5.
Signed-off-by: default avatarAnders Grafström <>
Signed-off-by: default avatarRussell King <>
parent 5d8614cc
......@@ -102,6 +102,8 @@
ldmdb sp, {r0 - lr}^ @ get calling r0 - lr
mov r0, r0 @ ARMv5T and earlier require a nop
@ after ldm {}^
add sp, sp, #S_FRAME_SIZE - S_PC
movs pc, lr @ return & move spsr_svc into cpsr
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment