From 63d49daa6a4b99da4a4c7c28fc619ffee5d84d98 Mon Sep 17 00:00:00 2001
From: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
Date: Mon, 4 Mar 2013 23:32:27 +0530
Subject: [PATCH] --- yaml --- r: 372985 b: refs/heads/master c:
 7bc7ae25b1438bb9fe1f176b951d758789847640 h: refs/heads/master i:   372983:
 96852f836d69456a71beaa5263885bb88e2354aa v: v3

---
 [refs]                    | 2 +-
 trunk/virt/kvm/kvm_main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c1d623b21654..e4c21f3f6383 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a08a8f9f0936e182d387afd85fdc5d303381521
+refs/heads/master: 7bc7ae25b1438bb9fe1f176b951d758789847640
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
index 470f2bc8205a..ff7154188b5f 100644
--- a/trunk/virt/kvm/kvm_main.c
+++ b/trunk/virt/kvm/kvm_main.c
@@ -1768,6 +1768,8 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *me)
 				continue;
 			} else if (pass && i > last_boosted_vcpu)
 				break;
+			if (!ACCESS_ONCE(vcpu->preempted))
+				continue;
 			if (vcpu == me)
 				continue;
 			if (waitqueue_active(&vcpu->wq))