diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2017-04-20 11:16:20 +0100 |
|---|---|---|
| committer | Christoffer Dall <cdall@linaro.org> | 2017-04-20 12:58:53 +0200 |
| commit | 5b560525add78e15fd5b75e5d03ea1ff988e6747 (patch) | |
| tree | 9b961f9cd6b1816f9b76d4bb0875262b062d39ac /arch/arm/kernel/hyp-stub.S | |
| parent | cffcd9df10daa753610d79f018466f9c61603b97 (diff) | |
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>
Diffstat (limited to 'arch/arm/kernel/hyp-stub.S')
| -rw-r--r-- | arch/arm/kernel/hyp-stub.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index d8523cc47a54..ec7e7377d423 100644 --- 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 |