From e5a381a2c22cb879a1ee2899fb7933c71c423512 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Mon, 12 May 2008 19:25:43 +0300
Subject: [PATCH] --- yaml --- r: 103703 b: refs/heads/master c:
 7682f2d0dd3ff5bd2756eac018a5b4e7e30ef16c h: refs/heads/master i:   103701:
 df71716ba272adc71b1c7f01a638a8008ccf9d21   103699:
 734f219b790428635a31dd6815b3948480aabf50   103695:
 a75e7f9afa23031f49d67ee4dfb380ea4d01bcf9 v: v3

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

diff --git a/[refs] b/[refs]
index a9eea0e3846e..304b35558c9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14ae51b6c068ef7ab52dc2d53fe226e6189f2ab2
+refs/heads/master: 7682f2d0dd3ff5bd2756eac018a5b4e7e30ef16c
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index 8c951d3eab30..fff8e23433d6 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -431,10 +431,8 @@ static void vmcs_write32(unsigned long field, u32 value)
 
 static void vmcs_write64(unsigned long field, u64 value)
 {
-#ifdef CONFIG_X86_64
-	vmcs_writel(field, value);
-#else
 	vmcs_writel(field, value);
+#ifndef CONFIG_X86_64
 	asm volatile ("");
 	vmcs_writel(field+1, value >> 32);
 #endif