---

yaml --- r: 54108 b: refs/heads/master c: 3fca036 h: refs/heads/master v: v3
git-mirror · May 3, 2007 · 1fe171e · 1fe171e
1 parent 2dff8df
commit 1fe171e
Show file tree

Hide file tree

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