---

yaml --- r: 297092 b: refs/heads/master c: 4e72dbe h: refs/heads/master v: v3
git-mirror · Mar 5, 2012 · 3f71be4 · 3f71be4
1 parent 98f93a5
commit 3f71be4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: befdc0a65afd17181392eff3d43c63407f266a9f
+refs/heads/master: 4e72dbe13528394a413889d73e5025dbdf6cab70
diff --git a/trunk/arch/powerpc/kvm/powerpc.c b/trunk/arch/powerpc/kvm/powerpc.c
@@ -562,7 +562,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
 	int cpu = vcpu->cpu;
 
 	me = get_cpu();
-	if (waitqueue_active(&vcpu->wq)) {
+	if (waitqueue_active(vcpu->arch.wqp)) {
 		wake_up_interruptible(vcpu->arch.wqp);
 		vcpu->stat.halt_wakeup++;
 	} else if (cpu != me && cpu != -1) {