Commit cf59eb13 authored by Wang Wensheng's avatar Wang Wensheng Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S: Fix symbol undeclared warnings 



Build the kernel with `C=2`:
arch/powerpc/kvm/book3s_hv_nested.c:572:25: warning: symbol
'kvmhv_alloc_nested' was not declared. Should it be static?
arch/powerpc/kvm/book3s_64_mmu_radix.c:350:6: warning: symbol
'kvmppc_radix_set_pte_at' was not declared. Should it be static?
arch/powerpc/kvm/book3s_hv.c:3568:5: warning: symbol
'kvmhv_p9_guest_entry' was not declared. Should it be static?
arch/powerpc/kvm/book3s_hv_rm_xics.c:767:15: warning: symbol 'eoi_rc'
was not declared. Should it be static?
arch/powerpc/kvm/book3s_64_vio_hv.c:240:13: warning: symbol
'iommu_tce_kill_rm' was not declared. Should it be static?
arch/powerpc/kvm/book3s_64_vio.c:492:6: warning: symbol
'kvmppc_tce_iommu_do_map' was not declared. Should it be static?
arch/powerpc/kvm/book3s_pr.c:572:6: warning: symbol 'kvmppc_set_pvr_pr'
was not declared. Should it be static?

Those symbols are used only in the files that define them so make them
static to fix the warnings.

Signed-off-by: default avatarWang Wensheng <wangwensheng4@huawei.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent eb173559

arch/powerpc/kvm/book3s_64_mmu_radix.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static unsigned long kvmppc_radix_update_pte(struct kvm *kvm, pte_t *ptep, 
	return __radix_pte_update(ptep, clr, set);

}



void kvmppc_radix_set_pte_at(struct kvm *kvm, unsigned long addr,

static void kvmppc_radix_set_pte_at(struct kvm *kvm, unsigned long addr,

			     pte_t *ptep, pte_t pte)

{

	radix__set_pte_at(kvm->mm, addr, ptep, pte, 0);

arch/powerpc/kvm/book3s_64_vio.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static long kvmppc_tce_iommu_unmap(struct kvm *kvm, 
	return ret;

}



long kvmppc_tce_iommu_do_map(struct kvm *kvm, struct iommu_table *tbl,

static long kvmppc_tce_iommu_do_map(struct kvm *kvm, struct iommu_table *tbl,

		unsigned long entry, unsigned long ua,

		enum dma_data_direction dir)

{

arch/powerpc/kvm/book3s_64_vio_hv.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static long iommu_tce_xchg_no_kill_rm(struct mm_struct *mm, 
	return ret;

}



extern void iommu_tce_kill_rm(struct iommu_table *tbl,

static void iommu_tce_kill_rm(struct iommu_table *tbl,

		unsigned long entry, unsigned long pages)

{

	if (tbl->it_ops->tce_kill)

arch/powerpc/kvm/book3s_hv.c

+1 −1
Original line number Diff line number Diff line
@@ -3568,7 +3568,7 @@ static int kvmhv_load_hv_regs_and_go(struct kvm_vcpu *vcpu, u64 time_limit, 
 * Virtual-mode guest entry for POWER9 and later when the host and

 * guest are both using the radix MMU.  The LPIDR has already been set.

 */

int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit,

static int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit,

			 unsigned long lpcr)

{

	struct kvmppc_vcore *vc = vcpu->arch.vcore;

arch/powerpc/kvm/book3s_hv_nested.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static void kvmhv_update_ptbl_cache(struct kvm_nested_guest *gp) 
	kvmhv_set_nested_ptbl(gp);

}



struct kvm_nested_guest *kvmhv_alloc_nested(struct kvm *kvm, unsigned int lpid)

static struct kvm_nested_guest *kvmhv_alloc_nested(struct kvm *kvm, unsigned int lpid)

{

	struct kvm_nested_guest *gp;

	long shadow_lpid;