path: root/arch/arm/cpu/armv7/start.S
diff options
authorTetsuyuki Kobayashi <>2013-04-05 00:12:51 +0000
committerAlbert ARIBAUD <>2013-04-13 11:12:46 +0200
commit4411b2aea7aa06d7b4aa5f4a7b36957af9b95e08 (patch)
treee50a5b0f57eeae5cf06c0bf920a6d049cce068e2 /arch/arm/cpu/armv7/start.S
parent0c669fd17a9d8452f70369474925a91139e3005d (diff)
BUGFIX: arm: data abort in get_bad_stack_swi
When swi instruction is executed, it is expected to get message "software interrupt" in console and dump registers and reboot, as do_software_interrupt() in arch/arm/lib/interrupts.c. But, actually it causes data abort accessing wrong address in get_bad_stack_swi macro in arch/arm/cpu/v7/start.S. This patch fixes this problem. The same mistake in arch/arm/cpu/{arm1136,arm1176,pxa}/start.S. Signed-off-by: Tetsuyuki Kobayashi <>
Diffstat (limited to 'arch/arm/cpu/armv7/start.S')
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index 64008ba6cf..61da7acde9 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -463,9 +463,10 @@ ENDPROC(cpu_init_crit)
@ spots for abort stack
str lr, [r0] @ save caller lr in position 0
@ of saved stack
- mrs r0, spsr @ get the spsr
+ mrs lr, spsr @ get the spsr
str lr, [r0, #4] @ save spsr in position 1 of
@ saved stack
+ ldr lr, [r0] @ restore lr
ldr r0, [r13] @ restore r0
add r13, r13, #4 @ pop stack entry
OpenPOWER on IntegriCloud