From b76704c037a21c626bf33f8c6d1abf0368e116c9 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Sun, 30 Sep 2007 10:50:12 +0200
Subject: [PATCH] --- yaml --- r: 80640 b: refs/heads/master c:
 eae5ecb5b9043812968fae7ad9d74bf5e7a50245 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/kvm/vmx.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 754efd148da0..9a378ea6dd2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4c6abfef400c0f74d9b86a149a6719706cfdbbc
+refs/heads/master: eae5ecb5b9043812968fae7ad9d74bf5e7a50245
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
index 27a3318fa6c2..cc2844203c24 100644
--- a/trunk/drivers/kvm/vmx.c
+++ b/trunk/drivers/kvm/vmx.c
@@ -225,7 +225,9 @@ static void __vcpu_clear(void *arg)
 
 static void vcpu_clear(struct vcpu_vmx *vmx)
 {
-	if (vmx->vcpu.cpu != raw_smp_processor_id() && vmx->vcpu.cpu != -1)
+	if (vmx->vcpu.cpu == -1)
+		return;
+	if (vmx->vcpu.cpu != raw_smp_processor_id())
 		smp_call_function_single(vmx->vcpu.cpu, __vcpu_clear,
 					 vmx, 0, 1);
 	else