diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-11-27 14:47:08 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-27 14:47:08 +0300 |
| commit | dc2286f397e69989c803abfdb0d75ae90b88c98c (patch) | |
| tree | f37b2b578b84a7186896ecb4540c7a160a5aff81 /arch/arm64/include/asm/kvm_asm.h | |
| parent | 6e5d8c713d1e0d1e3efb327dd61fdf01ffd256db (diff) | |
| parent | 4f6a36fed71dfe51df0ae9a282dc87c76d629bff (diff) | |
| download | linux-dc2286f397e69989c803abfdb0d75ae90b88c98c.tar.xz | |
Merge branch 'kvm-arm64/vector-rework' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kvm_asm.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_asm.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index a542c422a036..4a6a77d8d13e 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -34,8 +34,6 @@ */ #define KVM_VECTOR_PREAMBLE (2 * AARCH64_INSN_SIZE) -#define __SMCCC_WORKAROUND_1_SMC_SZ 36 - #define KVM_HOST_SMCCC_ID(id) \ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ ARM_SMCCC_SMC_64, \ @@ -175,7 +173,6 @@ extern unsigned long kvm_arm_hyp_percpu_base[NR_CPUS]; DECLARE_KVM_NVHE_SYM(__per_cpu_start); DECLARE_KVM_NVHE_SYM(__per_cpu_end); -extern atomic_t arm64_el2_vector_last_slot; DECLARE_KVM_HYP_SYM(__bp_harden_hyp_vecs); #define __bp_harden_hyp_vecs CHOOSE_HYP_SYM(__bp_harden_hyp_vecs) @@ -196,8 +193,6 @@ extern void __vgic_v3_init_lrs(void); extern u32 __kvm_get_mdcr_el2(void); -extern char __smccc_workaround_1_smc[__SMCCC_WORKAROUND_1_SMC_SZ]; - /* * Obtain the PC-relative address of a kernel symbol * s: symbol |