summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/virt.h
diff options
context:
space:
mode:
authorMarc Zyngier2017-04-03 20:37:47 +0200
committerChristoffer Dall2017-04-09 16:49:24 +0200
commit467f97b72b275ca24a390c2aec383c5f3d91b97a (patch)
tree3bc84168f0c8b973972a88670a421eb87aca6644 /arch/arm/include/asm/virt.h
parentARM: soft-reboot into same mode that we entered the kernel (diff)
downloadkernel-qcow2-linux-467f97b72b275ca24a390c2aec383c5f3d91b97a.tar.gz
kernel-qcow2-linux-467f97b72b275ca24a390c2aec383c5f3d91b97a.tar.xz
kernel-qcow2-linux-467f97b72b275ca24a390c2aec383c5f3d91b97a.zip
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/include/asm/virt.h')
-rw-r--r--arch/arm/include/asm/virt.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/include/asm/virt.h b/arch/arm/include/asm/virt.h
index 6dae1956c74d..4ea16fcaf2ed 100644
--- a/arch/arm/include/asm/virt.h
+++ b/arch/arm/include/asm/virt.h
@@ -94,6 +94,14 @@ extern char __hyp_text_start[];
extern char __hyp_text_end[];
#endif
+#else
+
+/* Only assembly code should need those */
+
+#define HVC_GET_VECTORS 0
+#define HVC_SET_VECTORS 1
+#define HVC_SOFT_RESTART 2
+
#endif /* __ASSEMBLY__ */
#endif /* ! VIRT_H */