summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-04-03 19:37:53 +0100
committerChristoffer Dall <cdall@linaro.org>2017-04-09 07:49:28 -0700
commitbc845e4fbbbbe97bab3f1bcf688be0b5da420717 (patch)
tree4e5c44a617dfdde8e7d71c02800172f6b36d38bf /arch/arm/kernel
parent7d1bf4e05717d900e69b249b4f08f6b36b00fbf0 (diff)
downloadlinux-bc845e4fbbbbe97bab3f1bcf688be0b5da420717.tar.gz
linux-bc845e4fbbbbe97bab3f1bcf688be0b5da420717.tar.bz2
linux-bc845e4fbbbbe97bab3f1bcf688be0b5da420717.zip
ARM: KVM: Implement HVC_RESET_VECTORS stub hypercall in the init code
In order to restore HYP mode to its original condition, KVM currently implements __kvm_hyp_reset(). As we're moving towards a hyp-stub defined API, it becomes necessary to implement HVC_RESET_VECTORS. This patch adds the HVC_RESET_VECTORS hypercall to the KVM init code, which so far lacked any form of hypercall support. Tested-by: Keerthy <j-keerthy@ti.com> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <cdall@linaro.org>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/hyp-stub.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S
index e637854335aa..675c50f5cb5c 100644
--- a/arch/arm/kernel/hyp-stub.S
+++ b/arch/arm/kernel/hyp-stub.S
@@ -280,7 +280,7 @@ ENDPROC(__hyp_reset_vectors)
#endif
.align 5
-__hyp_stub_vectors:
+ENTRY(__hyp_stub_vectors)
__hyp_stub_reset: W(b) .
__hyp_stub_und: W(b) .
__hyp_stub_svc: W(b) .