From 50dc0c370d836438c259a8f9743bae8d57cade36 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Thu, 10 Nov 2011 16:03:20 +0000
Subject: [PATCH] --- yaml --- r: 277021 b: refs/heads/master c:
 251da03897b383904901620835044e298061875f h: refs/heads/master i:   277019:
 265f47aab972d245ba3c2b5ba07ab7568205dd5a v: v3

---
 [refs]                             | 2 +-
 trunk/arch/powerpc/kvm/book3s_hv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 393a2ec780ef..b631235b0276 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96f38d72867bc54c312decaf8463f1e9607136da
+refs/heads/master: 251da03897b383904901620835044e298061875f
diff --git a/trunk/arch/powerpc/kvm/book3s_hv.c b/trunk/arch/powerpc/kvm/book3s_hv.c
index 0cb137a9b038..336983da9e72 100644
--- a/trunk/arch/powerpc/kvm/book3s_hv.c
+++ b/trunk/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();