From 67bbf300cf035c0d969260d3d0f4fc4cfc07b7b0 Mon Sep 17 00:00:00 2001
From: "Li, Xin B" <xin.b.li@intel.com>
Date: Wed, 1 Aug 2007 21:49:10 +0300
Subject: [PATCH] --- yaml --- r: 68387 b: refs/heads/master c:
 1e4e6e00136b82a5595de903c28912afee1178cb h: refs/heads/master i:   68385:
 a9f7bf44334e4b5c9b0f8df52fb42f5bba6afe89   68383:
 9fcf42a1d220f7d15f95cff8e1f81b0fbb8eb7c4 v: v3

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

diff --git a/[refs] b/[refs]
index b0d9034b889d..b7426e61fb6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a477034750ce59df7fc17823f085df5a30e316f0
+refs/heads/master: 1e4e6e00136b82a5595de903c28912afee1178cb
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
index 708055a50521..30c627d3b21d 100644
--- a/trunk/drivers/kvm/vmx.c
+++ b/trunk/drivers/kvm/vmx.c
@@ -1111,7 +1111,7 @@ static void enter_lmode(struct kvm_vcpu *vcpu)
 	find_msr_entry(to_vmx(vcpu), MSR_EFER)->data |= EFER_LMA | EFER_LME;
 	vmcs_write32(VM_ENTRY_CONTROLS,
 		     vmcs_read32(VM_ENTRY_CONTROLS)
-		     | VM_ENTRY_CONTROLS_IA32E_MASK);
+		     | VM_ENTRY_IA32E_MODE);
 }
 
 static void exit_lmode(struct kvm_vcpu *vcpu)
@@ -1120,7 +1120,7 @@ static void exit_lmode(struct kvm_vcpu *vcpu)
 
 	vmcs_write32(VM_ENTRY_CONTROLS,
 		     vmcs_read32(VM_ENTRY_CONTROLS)
-		     & ~VM_ENTRY_CONTROLS_IA32E_MASK);
+		     & ~VM_ENTRY_IA32E_MODE);
 }
 
 #endif
@@ -1185,13 +1185,13 @@ static void vmx_set_efer(struct kvm_vcpu *vcpu, u64 efer)
 	if (efer & EFER_LMA) {
 		vmcs_write32(VM_ENTRY_CONTROLS,
 				     vmcs_read32(VM_ENTRY_CONTROLS) |
-				     VM_ENTRY_CONTROLS_IA32E_MASK);
+				     VM_ENTRY_IA32E_MODE);
 		msr->data = efer;
 
 	} else {
 		vmcs_write32(VM_ENTRY_CONTROLS,
 				     vmcs_read32(VM_ENTRY_CONTROLS) &
-				     ~VM_ENTRY_CONTROLS_IA32E_MASK);
+				     ~VM_ENTRY_IA32E_MODE);
 
 		msr->data = efer & ~EFER_LME;
 	}
diff --git a/trunk/drivers/kvm/vmx.h b/trunk/drivers/kvm/vmx.h
index 7e4dc1208dd4..35d0b58c0a0b 100644
--- a/trunk/drivers/kvm/vmx.h
+++ b/trunk/drivers/kvm/vmx.h
@@ -268,9 +268,6 @@ enum vmcs_field {
 /* segment AR */
 #define SEGMENT_AR_L_MASK (1 << 13)
 
-/* entry controls */
-#define VM_ENTRY_CONTROLS_IA32E_MASK (1 << 9)
-
 #define AR_TYPE_ACCESSES_MASK 1
 #define AR_TYPE_READABLE_MASK (1 << 1)
 #define AR_TYPE_WRITEABLE_MASK (1 << 2)