aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2017-04-05 03:54:52 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2017-04-10 07:43:15 -0400
commit936774cd3fc8152e36c18a129fa940c42c177d14 (patch)
treea96f0ec78ef2489af55409477c311514c5856f5d
parentd3989143d03917ddcf7103d4ad5fc871e8d8954b (diff)
powerpc/kvm: Make kvmppc_xics_create_icp static
It's only used within the same file it's defined Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/include/asm/kvm_ppc.h4
-rw-r--r--arch/powerpc/kvm/book3s_xics.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
index dd11c4c8c56a..bfef1ae66ffd 100644
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -478,7 +478,6 @@ extern void kvmppc_free_host_rm_ops(void);
478extern void kvmppc_free_pimap(struct kvm *kvm); 478extern void kvmppc_free_pimap(struct kvm *kvm);
479extern int kvmppc_xics_rm_complete(struct kvm_vcpu *vcpu, u32 hcall); 479extern int kvmppc_xics_rm_complete(struct kvm_vcpu *vcpu, u32 hcall);
480extern void kvmppc_xics_free_icp(struct kvm_vcpu *vcpu); 480extern void kvmppc_xics_free_icp(struct kvm_vcpu *vcpu);
481extern int kvmppc_xics_create_icp(struct kvm_vcpu *vcpu, unsigned long server);
482extern int kvm_vm_ioctl_xics_irq(struct kvm *kvm, struct kvm_irq_level *args); 481extern int kvm_vm_ioctl_xics_irq(struct kvm *kvm, struct kvm_irq_level *args);
483extern int kvmppc_xics_hcall(struct kvm_vcpu *vcpu, u32 cmd); 482extern int kvmppc_xics_hcall(struct kvm_vcpu *vcpu, u32 cmd);
484extern u64 kvmppc_xics_get_icp(struct kvm_vcpu *vcpu); 483extern u64 kvmppc_xics_get_icp(struct kvm_vcpu *vcpu);
@@ -507,9 +506,6 @@ static inline int kvmppc_xics_rm_complete(struct kvm_vcpu *vcpu, u32 hcall)
507static inline int kvmppc_xics_enabled(struct kvm_vcpu *vcpu) 506static inline int kvmppc_xics_enabled(struct kvm_vcpu *vcpu)
508 { return 0; } 507 { return 0; }
509static inline void kvmppc_xics_free_icp(struct kvm_vcpu *vcpu) { } 508static inline void kvmppc_xics_free_icp(struct kvm_vcpu *vcpu) { }
510static inline int kvmppc_xics_create_icp(struct kvm_vcpu *vcpu,
511 unsigned long server)
512 { return -EINVAL; }
513static inline int kvm_vm_ioctl_xics_irq(struct kvm *kvm, 509static inline int kvm_vm_ioctl_xics_irq(struct kvm *kvm,
514 struct kvm_irq_level *args) 510 struct kvm_irq_level *args)
515 { return -ENOTTY; } 511 { return -ENOTTY; }
diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c
index e48803e2918d..ef4fd528c193 100644
--- a/arch/powerpc/kvm/book3s_xics.c
+++ b/arch/powerpc/kvm/book3s_xics.c
@@ -1084,7 +1084,7 @@ static struct kvmppc_ics *kvmppc_xics_create_ics(struct kvm *kvm,
1084 return xics->ics[icsid]; 1084 return xics->ics[icsid];
1085} 1085}
1086 1086
1087int kvmppc_xics_create_icp(struct kvm_vcpu *vcpu, unsigned long server_num) 1087static int kvmppc_xics_create_icp(struct kvm_vcpu *vcpu, unsigned long server_num)
1088{ 1088{
1089 struct kvmppc_icp *icp; 1089 struct kvmppc_icp *icp;
1090 1090