From dd2a8f505641f806c1b00ac18aebc2272470fe1b Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Sun, 30 Sep 2007 11:02:53 +0200
Subject: [PATCH] --- yaml --- r: 80641 b: refs/heads/master c:
 f566e09fc2c9f4164e1f0017c8c1c7a18bad7d72 h: refs/heads/master i:   80639:
 4ec94ccb2de9dac565c2dade08a027ee7be0ad31 v: v3

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

diff --git a/[refs] b/[refs]
index 9a378ea6dd2b..543e8ac3d7f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eae5ecb5b9043812968fae7ad9d74bf5e7a50245
+refs/heads/master: f566e09fc2c9f4164e1f0017c8c1c7a18bad7d72
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
index cc2844203c24..439873a25cca 100644
--- a/trunk/drivers/kvm/vmx.c
+++ b/trunk/drivers/kvm/vmx.c
@@ -227,11 +227,7 @@ static void vcpu_clear(struct vcpu_vmx *vmx)
 {
 	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
-		__vcpu_clear(vmx);
+	smp_call_function_single(vmx->vcpu.cpu, __vcpu_clear, vmx, 0, 1);
 	vmx->launched = 0;
 }