diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2017-04-03 21:37:47 +0300 |
|---|---|---|
| committer | Christoffer Dall <cdall@linaro.org> | 2017-04-09 17:49:24 +0300 |
| commit | 467f97b72b275ca24a390c2aec383c5f3d91b97a (patch) | |
| tree | 3bc84168f0c8b973972a88670a421eb87aca6644 /arch/arm/kvm | |
| parent | 9da5ac236de6ab2189c999eb9ddddeef1431ab68 (diff) | |
| download | linux-467f97b72b275ca24a390c2aec383c5f3d91b97a.tar.xz | |
ARM: KVM: Convert KVM to use HVC_GET_VECTORS
The conversion of the HYP stub ABI to something similar to arm64
left the KVM code broken, as it doesn't know about the new
stub numbering. Let's move the various #defines to virt.h, and
let KVM use HVC_GET_VECTORS.
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/kvm')
| -rw-r--r-- | arch/arm/kvm/hyp/hyp-entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/hyp/hyp-entry.S b/arch/arm/kvm/hyp/hyp-entry.S index 96beb53934c9..1f8db7d21fc5 100644 --- a/arch/arm/kvm/hyp/hyp-entry.S +++ b/arch/arm/kvm/hyp/hyp-entry.S @@ -127,7 +127,7 @@ hyp_hvc: pop {r0, r1, r2} /* Check for __hyp_get_vectors */ - cmp r0, #-1 + cmp r0, #HVC_GET_VECTORS mrceq p15, 4, r0, c12, c0, 0 @ get HVBAR beq 1f |