ARM: hyp-stub: Fix Thumb-2 compilation

The assembler defaults to emiting the short form of ADR, leading
to an out-of-range immediate. Using the wide version solves this
issue.

Fixes: bc845e4fbbbb ("ARM: KVM: Implement HVC_RESET_VECTORS stub hypercall in the init code")
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>

diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S
index d8523cc47a54633996d8e9caec5a34c3c33782ff..ec7e7377d423ddd5fa9d0bd3be0b2eb45a26209f 100644 (file)
--- a/arch/arm/kernel/hyp-stub.S
+++ b/arch/arm/kernel/hyp-stub.S
@@ -125,7 +125,7 @@ ENTRY(__hyp_stub_install_secondary)
  * (see safe_svcmode_maskall).
  */
        @ Now install the hypervisor stub:
-       adr     r7, __hyp_stub_vectors
+       W(adr)  r7, __hyp_stub_vectors
        mcr     p15, 4, r7, c12, c0, 0  @ set hypervisor vector base (HVBAR)
 
        @ Disable all traps, so we don't get any nasty surprise