aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-04-21 09:16:05 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-05-08 12:33:47 -0400
commit5890298a834c04aaa9b5fb576e5f2b77e79ab38d (patch)
tree901a5c333782769f7f29e2f0842d9cd3cea84045 /arch/arm/kvm
parentb787f68c36d49bb1d9236f403813641efa74a031 (diff)
ARM: kvm: fix a bad BSYM() usage
BSYM() should only be used when refering to local symbols in the same assembly file which are resolved by the assembler, and not for linker-fixed up symbols. The use of BSYM() with panic is incorrect as the linker is involved in fixing up this relocation, and it knows whether panic() is ARM or Thumb. Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: Dave Martin <Dave.Martin@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kvm')
-rw-r--r--arch/arm/kvm/interrupts.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
index 79caf79b304a..87847d2c5f99 100644
--- a/arch/arm/kvm/interrupts.S
+++ b/arch/arm/kvm/interrupts.S
@@ -309,7 +309,7 @@ ENTRY(kvm_call_hyp)
309THUMB( orr r2, r2, #PSR_T_BIT ) 309THUMB( orr r2, r2, #PSR_T_BIT )
310 msr spsr_cxsf, r2 310 msr spsr_cxsf, r2
311 mrs r1, ELR_hyp 311 mrs r1, ELR_hyp
312 ldr r2, =BSYM(panic) 312 ldr r2, =panic
313 msr ELR_hyp, r2 313 msr ELR_hyp, r2
314 ldr r0, =\panic_str 314 ldr r0, =\panic_str
315 clrex @ Clear exclusive monitor 315 clrex @ Clear exclusive monitor