summaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-04-03 19:37:59 +0100
committerChristoffer Dall <cdall@linaro.org>2017-04-09 07:49:32 -0700
commit0fb265930dbcdb6833094198b8b1b71b1d3ed88d (patch)
tree93eda3b3753e41a861553f3d6ce56927fa760f1b /arch/arm/kvm
parent386627d825d82ed3f7261a0de71a7cc4144e3c4b (diff)
downloadtalos-obmc-linux-0fb265930dbcdb6833094198b8b1b71b1d3ed88d.tar.gz
talos-obmc-linux-0fb265930dbcdb6833094198b8b1b71b1d3ed88d.zip
arm/arm64: KVM: Use __hyp_reset_vectors() directly
__cpu_reset_hyp_mode doesn't need to be passed any argument now, as the hyp-stub implementations are self-contained, and is now reduced to just calling __hyp_reset_vectors(). Let's drop the wrapper and use the stub hypercall directly. 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/kvm')
-rw-r--r--arch/arm/kvm/arm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 46fd37578693..c8f4fa69104e 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -1130,8 +1130,7 @@ static void cpu_hyp_reinit(void)
static void cpu_hyp_reset(void)
{
if (!is_kernel_in_hyp_mode())
- __cpu_reset_hyp_mode(hyp_default_vectors,
- kvm_get_idmap_start());
+ __hyp_reset_vectors();
}
static void _kvm_arch_hardware_enable(void *discard)
OpenPOWER on IntegriCloud