diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2013-12-30 15:36:56 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-01-27 16:00:52 +0100 |
| commit | 48eaef0518a565d3852e301c860e1af6a6db5a84 (patch) | |
| tree | 3eeeebb2723c0e22093418807b3a7ca1de38d39c /arch/powerpc | |
| parent | 736017752d2f6ed0d64f5e15cf48e79779b11c85 (diff) | |
| download | linux-stable-48eaef0518a565d3852e301c860e1af6a6db5a84.tar.gz linux-stable-48eaef0518a565d3852e301c860e1af6a6db5a84.tar.bz2 linux-stable-48eaef0518a565d3852e301c860e1af6a6db5a84.zip | |
KVM: PPC: Book3S HV: use xics_wake_cpu only when defined
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
CC: stable@vger.kernel.org
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 461f55566167..7e1813ceabc1 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -86,10 +86,13 @@ static void kvmppc_fast_vcpu_kick_hv(struct kvm_vcpu *vcpu) /* CPU points to the first thread of the core */ if (cpu != me && cpu >= 0 && cpu < nr_cpu_ids) { +#ifdef CONFIG_KVM_XICS int real_cpu = cpu + vcpu->arch.ptid; if (paca[real_cpu].kvm_hstate.xics_phys) xics_wake_cpu(real_cpu); - else if (cpu_online(cpu)) + else +#endif + if (cpu_online(cpu)) smp_send_reschedule(cpu); } put_cpu(); @@ -1142,7 +1145,9 @@ static void kvmppc_start_thread(struct kvm_vcpu *vcpu) smp_wmb(); #if defined(CONFIG_PPC_ICP_NATIVE) && defined(CONFIG_SMP) if (vcpu->arch.ptid) { +#ifdef CONFIG_KVM_XICS xics_wake_cpu(cpu); +#endif ++vc->n_woken; } #endif |