Răsfoiți Sursa

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>
Russell King 10 ani în urmă
părinte
comite
5890298a83
1 a modificat fișierele cu 1 adăugiri și 1 ștergeri
  1. 1 1
      arch/arm/kvm/interrupts.S

+ 1 - 1
arch/arm/kvm/interrupts.S

@@ -309,7 +309,7 @@ ENTRY(kvm_call_hyp)
 THUMB(	orr	r2, r2, #PSR_T_BIT	)
 THUMB(	orr	r2, r2, #PSR_T_BIT	)
 	msr	spsr_cxsf, r2
 	msr	spsr_cxsf, r2
 	mrs	r1, ELR_hyp
 	mrs	r1, ELR_hyp
-	ldr	r2, =BSYM(panic)
+	ldr	r2, =panic
 	msr	ELR_hyp, r2
 	msr	ELR_hyp, r2
 	ldr	r0, =\panic_str
 	ldr	r0, =\panic_str
 	clrex				@ Clear exclusive monitor
 	clrex				@ Clear exclusive monitor