Commit 6fef0c6b authored by Greg Kurz's avatar Greg Kurz Committed by Paul Mackerras
Browse files

KVM: PPC: Kill kvmppc_ops::mmu_destroy() and kvmppc_mmu_destroy() 



These are only used by HV KVM and BookE, and in both cases they are
nops.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 3f1268dd

arch/powerpc/include/asm/kvm_ppc.h

+0 −2
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr, 
                           unsigned int gtlb_idx);

extern void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode);

extern void kvmppc_mmu_switch_pid(struct kvm_vcpu *vcpu, u32 pid);

extern void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu);

extern int kvmppc_mmu_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);

extern int kvmppc_mmu_itlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);

extern gpa_t kvmppc_mmu_xlate(struct kvm_vcpu *vcpu, unsigned int gtlb_index,
@@ -288,7 +287,6 @@ struct kvmppc_ops { 
	int (*age_hva)(struct kvm *kvm, unsigned long start, unsigned long end);

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

	void (*set_spte_hva)(struct kvm *kvm, unsigned long hva, pte_t pte);

	void (*mmu_destroy)(struct kvm_vcpu *vcpu);

	void (*free_memslot)(struct kvm_memory_slot *slot);

	int (*init_vm)(struct kvm *kvm);

	void (*destroy_vm)(struct kvm *kvm);

arch/powerpc/kvm/book3s.c

+0 −5
Original line number Diff line number Diff line
@@ -858,11 +858,6 @@ int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte) 
	return 0;

}



void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu)

{

	vcpu->kvm->arch.kvm_ops->mmu_destroy(vcpu);

}



int kvmppc_core_init_vm(struct kvm *kvm)

{

arch/powerpc/kvm/book3s_hv.c

+0 −6
Original line number Diff line number Diff line
@@ -4555,11 +4555,6 @@ void kvmppc_update_lpcr(struct kvm *kvm, unsigned long lpcr, unsigned long mask) 
	}

}



static void kvmppc_mmu_destroy_hv(struct kvm_vcpu *vcpu)

{

	return;

}



void kvmppc_setup_partition_table(struct kvm *kvm)

{

	unsigned long dw0, dw1;
@@ -5523,7 +5518,6 @@ static struct kvmppc_ops kvm_ops_hv = { 
	.age_hva  = kvm_age_hva_hv,

	.test_age_hva = kvm_test_age_hva_hv,

	.set_spte_hva = kvm_set_spte_hva_hv,

	.mmu_destroy  = kvmppc_mmu_destroy_hv,

	.free_memslot = kvmppc_core_free_memslot_hv,

	.init_vm =  kvmppc_core_init_vm_hv,

	.destroy_vm = kvmppc_core_destroy_vm_hv,

arch/powerpc/kvm/book3s_pr.c

+0 −1
Original line number Diff line number Diff line
@@ -2087,7 +2087,6 @@ static struct kvmppc_ops kvm_ops_pr = { 
	.age_hva  = kvm_age_hva_pr,

	.test_age_hva = kvm_test_age_hva_pr,

	.set_spte_hva = kvm_set_spte_hva_pr,

	.mmu_destroy  = kvmppc_mmu_destroy_pr,

	.free_memslot = kvmppc_core_free_memslot_pr,

	.init_vm = kvmppc_core_init_vm_pr,

	.destroy_vm = kvmppc_core_destroy_vm_pr,

arch/powerpc/kvm/booke.c

+0 −5
Original line number Diff line number Diff line
@@ -2073,11 +2073,6 @@ void kvmppc_booke_vcpu_put(struct kvm_vcpu *vcpu) 
	kvmppc_clear_dbsr();

}



void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu)

{

	vcpu->kvm->arch.kvm_ops->mmu_destroy(vcpu);

}



int kvmppc_core_init_vm(struct kvm *kvm)

{

	return kvm->arch.kvm_ops->init_vm(kvm);