On 7 September 2018 14:12:55 BST, Christoffer Dall <christoffer.dall@xxxxxxx> wrote:
>From: Marc Zyngier <marc.zyngier@xxxxxxx>
>
>kvm_unmap_hva is long gone, and we only have kvm_unmap_hva_range to
>deal with. Drop the now obsolete code.
>
>Fixes: fb1522e099f0 ("KVM: update to new mmu_notifier semantic v2")
>Cc: James Hogan <jhogan@xxxxxxxxxx>
>Reviewed-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
>Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>
>Signed-off-by: Christoffer Dall <christoffer.dall@xxxxxxx>
>---
> arch/mips/include/asm/kvm_host.h | 1 -
> arch/mips/kvm/mmu.c | 10 ----------
>diff --git a/arch/mips/include/asm/kvm_host.h
>b/arch/mips/include/asm/kvm_host.h
>index a9af1d2dcd69..2c1c53d12179 100644
>--- a/arch/mips/include/asm/kvm_host.h
>+++ b/arch/mips/include/asm/kvm_host.h
>@@ -931,7 +931,6 @@ enum kvm_mips_fault_result
>kvm_trap_emul_gva_fault(struct kvm_vcpu *vcpu,
> bool write);
>
> #define KVM_ARCH_WANT_MMU_NOTIFIER
>-int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
> int kvm_unmap_hva_range(struct kvm *kvm,
> unsigned long start, unsigned long end);
> void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
>diff --git a/arch/mips/kvm/mmu.c b/arch/mips/kvm/mmu.c
>index ee64db032793..d8dcdb350405 100644
>--- a/arch/mips/kvm/mmu.c
>+++ b/arch/mips/kvm/mmu.c
>@@ -512,16 +512,6 @@ static int kvm_unmap_hva_handler(struct kvm *kvm,
>gfn_t gfn, gfn_t gfn_end,
> return 1;
> }
>
>-int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)
>-{
>- unsigned long end = hva + PAGE_SIZE;
>-
>- handle_hva_to_gpa(kvm, hva, end, &kvm_unmap_hva_handler, NULL);
>-
>- kvm_mips_callbacks->flush_shadow_all(kvm);
>- return 0;
>-}
>-
>int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned
>long end)
> {
> handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, NULL);
Looks good to me. For MIPS:
Acked-by: James Hogan <jhogan@xxxxxxxxxx>
thanks
James
