summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/entry-header.S
diff options
context:
space:
mode:
authorAnders Grafström <grfstrm@users.sourceforge.net>2010-03-15 16:04:14 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-15 17:20:08 +0000
commit8e4971f2fb2380ce66196136e113d04196b80fcd (patch)
tree18504783969d9e5005deadaa8709a475cc30e04f /arch/arm/kernel/entry-header.S
parent5d8614cc5d6c5c02b7995ed97303481d4e3a8cc7 (diff)
downloadblackbird-op-linux-8e4971f2fb2380ce66196136e113d04196b80fcd.tar.gz
blackbird-op-linux-8e4971f2fb2380ce66196136e113d04196b80fcd.zip
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 b86040a59feb255a8193173caa4d5199464433d5. Signed-off-by: Anders Grafström <grfstrm@users.sourceforge.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-header.S')
-rw-r--r--arch/arm/kernel/entry-header.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 7e9ed1eea40a..d93f976fb389 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -102,6 +102,8 @@
.else
ldmdb sp, {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
movs pc, lr @ return & move spsr_svc into cpsr
.endm
OpenPOWER on IntegriCloud