Commit 9af3e08b authored by Will Deacon's avatar Will Deacon Committed by Marc Zyngier
Browse files

KVM: arm64: Remove kvm_mmu_free_memory_caches() 



kvm_mmu_free_memory_caches() is only called by kvm_arch_vcpu_destroy(),
so inline the implementation and get rid of the extra function.

Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarGavin Shan <gshan@redhat.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Quentin Perret <qperret@google.com>
Link: https://lore.kernel.org/r/20200911132529.19844-2-will@kernel.org
parent f4d51dff

arch/arm64/include/asm/kvm_mmu.h

+0 −2
Original line number Diff line number Diff line
@@ -141,8 +141,6 @@ int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa, 


int kvm_handle_guest_abort(struct kvm_vcpu *vcpu);



void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu);



phys_addr_t kvm_mmu_get_httbr(void);

phys_addr_t kvm_get_idmap_vector(void);

int kvm_mmu_init(void);

arch/arm64/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) 
	if (vcpu->arch.has_run_once && unlikely(!irqchip_in_kernel(vcpu->kvm)))

		static_branch_dec(&userspace_irqchip_in_use);



	kvm_mmu_free_memory_caches(vcpu);

	kvm_mmu_free_memory_cache(&vcpu->arch.mmu_page_cache);

	kvm_timer_vcpu_terminate(vcpu);

	kvm_pmu_vcpu_destroy(vcpu);

arch/arm64/kvm/mmu.c

+0 −5
Original line number Diff line number Diff line
@@ -2324,11 +2324,6 @@ int kvm_test_age_hva(struct kvm *kvm, unsigned long hva) 
				 kvm_test_age_hva_handler, NULL);

}



void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu)

{

	kvm_mmu_free_memory_cache(&vcpu->arch.mmu_page_cache);

}



phys_addr_t kvm_mmu_get_httbr(void)

{

	if (__kvm_cpu_uses_extended_idmap())

CRA Git | Maintained and supported by SUSTech CRA and CCSE