diff options
author | Marc Zyngier <maz@kernel.org> | 2020-07-28 15:48:27 +0100 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2020-07-28 15:48:27 +0100 |
commit | 300dca6853392829522be2ffb5d9a837b7c82296 (patch) | |
tree | ac0abd84ce546c8a226ea1c6781603dcec6a1126 /arch/arm64/include/asm/kvm_asm.h | |
parent | c199a009fe0e84acf2d5b90bb265e72b672b0f9b (diff) | |
parent | 41ce82f63c0624556b94b90551e4f70a0c913879 (diff) | |
download | lwn-300dca6853392829522be2ffb5d9a837b7c82296.tar.gz lwn-300dca6853392829522be2ffb5d9a837b7c82296.zip |
Merge branch 'kvm-arm64/pre-nv-5.9' into kvmarm-master/next-WIP
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 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 1a66815ea01b..dc37a5055137 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -95,6 +95,7 @@ extern void *__nvhe_undefined_symbol; struct kvm; struct kvm_vcpu; +struct kvm_s2_mmu; DECLARE_KVM_NVHE_SYM(__kvm_hyp_init); DECLARE_KVM_HYP_SYM(__kvm_hyp_vector); @@ -108,9 +109,10 @@ DECLARE_KVM_HYP_SYM(__bp_harden_hyp_vecs); #endif extern void __kvm_flush_vm_context(void); -extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa); -extern void __kvm_tlb_flush_vmid(struct kvm *kvm); -extern void __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu); +extern void __kvm_tlb_flush_vmid_ipa(struct kvm_s2_mmu *mmu, phys_addr_t ipa, + int level); +extern void __kvm_tlb_flush_vmid(struct kvm_s2_mmu *mmu); +extern void __kvm_tlb_flush_local_vmid(struct kvm_s2_mmu *mmu); extern void __kvm_timer_set_cntvoff(u64 cntvoff); |