Merge branch 'kvm-arm64/memslot-fixes' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --cc arch/arm64/include/asm/kvm_host.h
index 1ddb8c1,688f2df..0b926f0
--- 1/arch/arm64/include/asm/kvm_host.h
--- 2/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@@ -637,14 -630,8 +637,13 @@@ void kvm_arm_resume_guest(struct kvm *k
                                                                        \
                ret;                                                    \
        })
 +#else /* __KVM_NVHE_HYPERVISOR__ */
 +#define kvm_call_hyp(f, ...) f(__VA_ARGS__)
 +#define kvm_call_hyp_ret(f, ...) f(__VA_ARGS__)
 +#define kvm_call_hyp_nvhe(f, ...) f(__VA_ARGS__)
 +#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);

diff --cc arch/arm64/kvm/mmu.c
Simple merge