---

yaml --- r: 80869 b: refs/heads/master c: 6c14280 h: refs/heads/master i: 80867: f990270 v: v3
git-mirror · Jan 30, 2008 · f584a6b · f584a6b
1 parent c2e5f13
commit f584a6b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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();