diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-12 14:25:02 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-12 14:31:37 +0200 |
| commit | 3c19d5ada1bec8b97119215298df7669d3ffb3db (patch) | |
| tree | bbc728296e01ff7403164072e4f87ad01de2c6ea /arch/powerpc/kvm/book3s_xics.c | |
| parent | powerpc/powernv: Recover correct PACA on wakeup from a stop on P9 DD1 (diff) | |
| parent | powerpc: Fixup LPCR:PECE and HEIC setting on POWER9 (diff) | |
| download | linux-3c19d5ada1bec8b97119215298df7669d3ffb3db.tar.xz linux-3c19d5ada1bec8b97119215298df7669d3ffb3db.zip | |
Merge branch 'topic/xive' (early part) into next
This merges the arch part of the XIVE support, leaving the final commit
with the KVM specific pieces dangling on the branch for Paul to merge
via the kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/kvm/book3s_xics.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_xics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c index dc4352395887..459b72cb617a 100644 --- a/arch/powerpc/kvm/book3s_xics.c +++ b/arch/powerpc/kvm/book3s_xics.c @@ -1083,7 +1083,7 @@ static struct kvmppc_ics *kvmppc_xics_create_ics(struct kvm *kvm, return xics->ics[icsid]; } -int kvmppc_xics_create_icp(struct kvm_vcpu *vcpu, unsigned long server_num) +static int kvmppc_xics_create_icp(struct kvm_vcpu *vcpu, unsigned long server_num) { struct kvmppc_icp *icp; |