From 51cebb71a5e0a24bd2b20615117b995208a87f25 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Mon, 1 Nov 2010 14:01:13 +0100
Subject: [PATCH] --- yaml --- r: 221649 b: refs/heads/master c:
 453d9c57e27b4401bc3e98906bcac31ae8be0165 h: refs/heads/master i:   221647:
 48e1c3b2d626cbacd4de2adcc78e9735b049f8c9 v: v3

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

diff --git a/[refs] b/[refs]
index b8d473725b4b..49d87fa79361 100644
--- 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
index 463c65b8f93f..cdac9e592aa5 100644
--- 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();