diff options
| author | Deepak Nibade <dnibade@nvidia.com> | 2014-03-13 11:05:11 +0530 |
|---|---|---|
| committer | Deepak Nibade <dnibade@nvidia.com> | 2014-03-13 11:05:11 +0530 |
| commit | 9a56e248ceed0932efe75287f4fced7d80004fb3 (patch) | |
| tree | c9e3804e8c78152778dea2e7343f97926aec8b81 /arch/powerpc/kvm/book3s_hv.c | |
| parent | f83157af2b0ca9214efde0fd92e988d708e0423c (diff) | |
| parent | 50a3a706c880500ec305e7af51bd5f2363a8cc44 (diff) | |
Merge branch 'linux-3.10.33' into dev-kernel-3.10
Bug 1456092
Change-Id: Ic563f451abb08754fea0e2bbf0ce065ca2e6e770
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv.c')
| -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 550f5928b394..102ad8a255f3 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -82,10 +82,13 @@ void kvmppc_fast_vcpu_kick(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(); @@ -1090,7 +1093,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 |