diff options
author | Marc Zyngier <maz@kernel.org> | 2021-04-13 15:35:40 +0100 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2021-04-13 15:35:40 +0100 |
commit | 3d63ef4d523edb365dd6c91464ccc18e7bda510d (patch) | |
tree | 270b975d208b5201cb759b923f02b23965dbde07 /arch/arm64/include/asm/kvm_host.h | |
parent | ac5ce2456e3e68c8ab6f03be2c2af832ec0f99b5 (diff) | |
parent | 10ba2d17d2972926c60e01dace6d7a3f8d968c4f (diff) | |
download | linux-3d63ef4d523edb365dd6c91464ccc18e7bda510d.tar.gz linux-3d63ef4d523edb365dd6c91464ccc18e7bda510d.tar.bz2 linux-3d63ef4d523edb365dd6c91464ccc18e7bda510d.zip |
Merge branch 'kvm-arm64/memslot-fixes' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kvm_host.h')
-rw-r--r-- | arch/arm64/include/asm/kvm_host.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 1ddb8c1d366b..0b926f027895 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -644,7 +644,6 @@ void kvm_arm_resume_guest(struct kvm *kvm); #endif /* __KVM_NVHE_HYPERVISOR__ */ void force_vm_exit(const cpumask_t *mask); -void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot); int handle_exit(struct kvm_vcpu *vcpu, int exception_index); void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index); |