From f584a6b230a96552640b315781c4f73398a78c5a Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Tue, 15 Jan 2008 18:27:32 +0200
Subject: [PATCH] --- yaml --- r: 80869 b: refs/heads/master c:
 6c14280125a374d4c279a68276f97245e03e3f68 h: refs/heads/master i:   80867:
 f990270a2e80f636492a7a4890c5264056fba5a6 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 21b71daf0501..4d0174bb6e70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97db56ce6cc2a0766b536cc227a1da20acc5d82f
+refs/heads/master: 6c14280125a374d4c279a68276f97245e03e3f68
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 77d57ff3d74e..f0493e7dcf0c 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -2535,6 +2535,13 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 
 	local_irq_disable();
 
+	if (need_resched()) {
+		local_irq_enable();
+		preempt_enable();
+		r = 1;
+		goto out;
+	}
+
 	if (signal_pending(current)) {
 		local_irq_enable();
 		preempt_enable();