From 7c56151b957c5f51dfebf84eed6b2c77fb3b2e61 Mon Sep 17 00:00:00 2001
From: Matt Evans <matt@ozlabs.org>
Date: Tue, 6 Dec 2011 21:19:42 +0000
Subject: [PATCH] --- yaml --- r: 297105 b: refs/heads/master c:
 03cdab5340b423ec88fc18eb158a62a8a7b94d7f h: refs/heads/master i:   297103:
 77689d0214b2b32c2798e50781486932a849d2f2 v: v3

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

diff --git a/[refs] b/[refs]
index 11026ba6c01e..614729c8d80d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cf302bc106566c5bad523337296ea8b72df63f5
+refs/heads/master: 03cdab5340b423ec88fc18eb158a62a8a7b94d7f
diff --git a/trunk/arch/powerpc/kvm/powerpc.c b/trunk/arch/powerpc/kvm/powerpc.c
index 06e955b5837e..25171037a36c 100644
--- a/trunk/arch/powerpc/kvm/powerpc.c
+++ b/trunk/arch/powerpc/kvm/powerpc.c
@@ -289,9 +289,10 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
 {
 	struct kvm_vcpu *vcpu;
 	vcpu = kvmppc_core_vcpu_create(kvm, id);
-	vcpu->arch.wqp = &vcpu->wq;
-	if (!IS_ERR(vcpu))
+	if (!IS_ERR(vcpu)) {
+		vcpu->arch.wqp = &vcpu->wq;
 		kvmppc_create_vcpu_debugfs(vcpu, id);
+	}
 	return vcpu;
 }