From 5cf3a848a82306a4da37981f3bc5dfe5be85c242 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 9 Dec 2011 15:20:46 +0100
Subject: [PATCH] --- yaml --- r: 297087 b: refs/heads/master c:
 ae21216bece0a623d09980c120b9c98790a860b9 h: refs/heads/master i:   297085:
 655867f0d50753a24c8a176d4a40162d01ee1610   297083:
 45b10b5fb9db257303a86d5881cb9331b083f1f9   297079:
 2c01f7298bdf96adb4defee3129f7343aaf9799c   297071:
 0363bf39c4a07d55ea0a11f8b0bc9c68af726317   297055:
 dc9cc3242b0333e4a074e5fa3f97dbb1d182c862   297023:
 8baa74b84a9365791938ea6a352af6bf1f1f37e4   296959:
 615aba3617f3ca78937aac37009de45ee6319e42 v: v3

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

diff --git a/[refs] b/[refs]
index 0107ed00bb2a..65a18c7c639f 100644
--- 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
index fd8d3b16eaf3..e1ef4d6d972a 100644
--- 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)