diff options
| author | Clark Williams <williams@redhat.com> | 2012-01-05 12:51:32 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-05 12:51:32 -0600 |
| commit | d76fe430665fac3f44ee88958713ecc524fd778d (patch) | |
| tree | 00206c8b11eb2084d38eeccfe4b41f5e89fb779c /arch/powerpc/kvm/book3s_hv.c | |
| parent | 63076d7f7f7f2650e5d0a4fa5dd2c412a255c237 (diff) | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
Merge commit 'v3.2' into rt-3.2-rt9v3.2-rt9
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 0cb137a9b038..336983da9e72 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -538,7 +538,7 @@ static void kvmppc_start_thread(struct kvm_vcpu *vcpu) tpaca->kvm_hstate.napping = 0; vcpu->cpu = vc->pcpu; smp_wmb(); -#ifdef CONFIG_PPC_ICP_NATIVE +#if defined(CONFIG_PPC_ICP_NATIVE) && defined(CONFIG_SMP) if (vcpu->arch.ptid) { tpaca->cpu_start = 0x80; wmb(); |