From 1fe171e3db363920df7451b7336cb9fbfa18c083 Mon Sep 17 00:00:00 2001
From: Yaozu Dong <eddie.dong@intel.com>
Date: Wed, 25 Apr 2007 16:49:19 +0300
Subject: [PATCH] --- yaml --- r: 54108 b: refs/heads/master c:
 3fca03653010b8c5fa63b99fc94c78cbfb433d00 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8b8999e92c74..e3917a74a3b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6c69ee9a24b307ce94e55ebfba6208a830c9ecb
+refs/heads/master: 3fca03653010b8c5fa63b99fc94c78cbfb433d00
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index 03c0ee74d757..f5356358acff 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -1590,6 +1590,8 @@ static int set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)
 
 void kvm_resched(struct kvm_vcpu *vcpu)
 {
+	if (!need_resched())
+		return;
 	vcpu_put(vcpu);
 	cond_resched();
 	vcpu_load(vcpu);