---

yaml --- r: 221649 b: refs/heads/master c: 453d9c5 h: refs/heads/master i: 221647: 48e1c3b v: v3
git-mirror · Nov 5, 2010 · 51cebb7 · 51cebb7
1 parent 9fa94bc
commit 51cebb7
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: 97e69aa62f8b5d338d6cff49be09e37cc1262838
+refs/heads/master: 453d9c57e27b4401bc3e98906bcac31ae8be0165
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
@@ -3978,8 +3978,10 @@ int kvm_emulate_wbinvd(struct kvm_vcpu *vcpu)
 		return X86EMUL_CONTINUE;
 
 	if (kvm_x86_ops->has_wbinvd_exit()) {
+		preempt_disable();
 		smp_call_function_many(vcpu->arch.wbinvd_dirty_mask,
 				wbinvd_ipi, NULL, 1);
+		preempt_enable();
 		cpumask_clear(vcpu->arch.wbinvd_dirty_mask);
 	}
 	wbinvd();