---

yaml --- r: 297087 b: refs/heads/master c: ae21216 h: refs/heads/master i: 297085: 655867f 297083: 45b10b5 297079: 2c01f72 297071: 0363bf3 297055: dc9cc32 297023: 8baa74b 296959: 615aba3 v: v3
git-mirror · Mar 5, 2012 · 5cf3a84 · 5cf3a84
1 parent e389065
commit 5cf3a84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 468a12c2b53776721ff83517d4a195b85c5fce54
+refs/heads/master: ae21216bece0a623d09980c120b9c98790a860b9
diff --git a/trunk/arch/powerpc/kvm/powerpc.c b/trunk/arch/powerpc/kvm/powerpc.c
@@ -558,12 +558,17 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
 
 void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
 {
+	int me;
+	int cpu = vcpu->cpu;
+
+	me = get_cpu();
 	if (waitqueue_active(&vcpu->wq)) {
 		wake_up_interruptible(vcpu->arch.wqp);
 		vcpu->stat.halt_wakeup++;
-	} else if (vcpu->cpu != -1) {
+	} else if (cpu != me && cpu != -1) {
 		smp_send_reschedule(vcpu->cpu);
 	}
+	put_cpu();
 }
 
 int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq)