diff options
author | David S. Miller <davem@davemloft.net> | 2020-08-23 20:48:27 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-08-23 20:48:27 +0200 |
commit | 7611cbb900b4b9a6fe5eca12fb12645c0576a015 (patch) | |
tree | 9c8c8e1fa991e4728d25a19b86c974c8e49ee1b7 /arch/mips/include/asm | |
parent | Merge branch 'l2tp-replace-custom-logging-code-with-tracepoints' (diff) | |
parent | Merge tag 'powerpc-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
download | linux-7611cbb900b4b9a6fe5eca12fb12645c0576a015.tar.xz linux-7611cbb900b4b9a6fe5eca12fb12645c0576a015.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'arch/mips/include/asm')
-rw-r--r-- | arch/mips/include/asm/kvm_host.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h index d35eaed1668f..825d337a505a 100644 --- a/arch/mips/include/asm/kvm_host.h +++ b/arch/mips/include/asm/kvm_host.h @@ -969,7 +969,7 @@ enum kvm_mips_fault_result kvm_trap_emul_gva_fault(struct kvm_vcpu *vcpu, #define KVM_ARCH_WANT_MMU_NOTIFIER int kvm_unmap_hva_range(struct kvm *kvm, - unsigned long start, unsigned long end); + unsigned long start, unsigned long end, unsigned flags); int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte); int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end); int kvm_test_age_hva(struct kvm *kvm, unsigned long hva); |