diff options
author | Marc Zyngier <maz@kernel.org> | 2020-03-24 17:43:53 +0000 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2020-03-24 17:43:53 +0000 |
commit | 463050599742a89e0508355e626e032e8d0dab8d (patch) | |
tree | d45aa349959a04168ab4ef343ae79a376cf0d1b8 /arch/arm/include/asm/virt.h | |
parent | cc98702c1775a9ff3d943674c97d9561cf605fcd (diff) | |
parent | 544e56aa63777f26978bf94286d22c60163e63e4 (diff) | |
download | linux-463050599742a89e0508355e626e032e8d0dab8d.tar.gz linux-463050599742a89e0508355e626e032e8d0dab8d.tar.bz2 linux-463050599742a89e0508355e626e032e8d0dab8d.zip |
Merge tag 'kvm-arm-removal' into kvmarm-master/next
Goodbye KVM/arm
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm/include/asm/virt.h')
-rw-r--r-- | arch/arm/include/asm/virt.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/include/asm/virt.h b/arch/arm/include/asm/virt.h index 17c26ccd126d..dd9697b2bde8 100644 --- a/arch/arm/include/asm/virt.h +++ b/arch/arm/include/asm/virt.h @@ -39,8 +39,6 @@ static inline void sync_boot_mode(void) sync_cache_r(&__boot_cpu_mode); } -void __hyp_set_vectors(unsigned long phys_vector_base); -void __hyp_reset_vectors(void); #else #define __boot_cpu_mode (SVC_MODE) #define sync_boot_mode() @@ -67,18 +65,6 @@ static inline bool is_kernel_in_hyp_mode(void) return false; } -static inline bool has_vhe(void) -{ - return false; -} - -/* The section containing the hypervisor idmap text */ -extern char __hyp_idmap_text_start[]; -extern char __hyp_idmap_text_end[]; - -/* The section containing the hypervisor text */ -extern char __hyp_text_start[]; -extern char __hyp_text_end[]; #endif #else @@ -87,9 +73,6 @@ extern char __hyp_text_end[]; #define HVC_SET_VECTORS 0 #define HVC_SOFT_RESTART 1 -#define HVC_RESET_VECTORS 2 - -#define HVC_STUB_HCALL_NR 3 #endif /* __ASSEMBLY__ */ |