Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27aa8962 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-ppc-next-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

KVM PPC update for 4.17

- Improvements for the radix page fault handler for HV KVM on POWER9.
parents f497b6c2 31c8b0d0

arch/powerpc/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 


#define KVM_ARCH_WANT_MMU_NOTIFIER



extern int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);

extern int kvm_unmap_hva_range(struct kvm *kvm,

			       unsigned long start, unsigned long end);

extern int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);

arch/powerpc/include/asm/kvm_ppc.h

+0 −1
Original line number Diff line number Diff line
@@ -295,7 +295,6 @@ struct kvmppc_ops { 
				     const struct kvm_userspace_memory_region *mem,

				     const struct kvm_memory_slot *old,

				     const struct kvm_memory_slot *new);

	int (*unmap_hva)(struct kvm *kvm, unsigned long hva);

	int (*unmap_hva_range)(struct kvm *kvm, unsigned long start,

			   unsigned long end);

	int (*age_hva)(struct kvm *kvm, unsigned long start, unsigned long end);

arch/powerpc/kvm/book3s.c

+0 −6
Original line number Diff line number Diff line
@@ -819,12 +819,6 @@ void kvmppc_core_commit_memory_region(struct kvm *kvm, 
	kvm->arch.kvm_ops->commit_memory_region(kvm, mem, old, new);

}



int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)

{

	return kvm->arch.kvm_ops->unmap_hva(kvm, hva);

}

EXPORT_SYMBOL_GPL(kvm_unmap_hva);



int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end)

{

	return kvm->arch.kvm_ops->unmap_hva_range(kvm, start, end);

arch/powerpc/kvm/book3s.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


extern void kvmppc_core_flush_memslot_hv(struct kvm *kvm,

					 struct kvm_memory_slot *memslot);

extern int kvm_unmap_hva_hv(struct kvm *kvm, unsigned long hva);

extern int kvm_unmap_hva_range_hv(struct kvm *kvm, unsigned long start,

				  unsigned long end);

extern int kvm_age_hva_hv(struct kvm *kvm, unsigned long start,

arch/powerpc/kvm/book3s_64_mmu_hv.c

+0 −9
Original line number Diff line number Diff line
@@ -877,15 +877,6 @@ static int kvm_unmap_rmapp(struct kvm *kvm, struct kvm_memory_slot *memslot, 
	return 0;

}



int kvm_unmap_hva_hv(struct kvm *kvm, unsigned long hva)

{

	hva_handler_fn handler;



	handler = kvm_is_radix(kvm) ? kvm_unmap_radix : kvm_unmap_rmapp;

	kvm_handle_hva(kvm, hva, handler);

	return 0;

}



int kvm_unmap_hva_range_hv(struct kvm *kvm, unsigned long start, unsigned long end)

{

	hva_handler_fn handler;