Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / drivers / kvm / vmx.h

diff --git a/drivers/kvm/vmx.h b/drivers/kvm/vmx.h
index 797278341581e49a15d1c9f1164aff0a05718e7a..4c0ab151836ae5374c4fd61efc685b03838c38e3 100644 (file)
--- a/drivers/kvm/vmx.h
+++ b/drivers/kvm/vmx.h
@@ -286,11 +286,11 @@ enum vmcs_field {
 
 #define CR4_VMXE 0x2000
 
-#define MSR_IA32_VMX_BASIC_MSR                 0x480
+#define MSR_IA32_VMX_BASIC             0x480
 #define MSR_IA32_FEATURE_CONTROL               0x03a
-#define MSR_IA32_VMX_PINBASED_CTLS_MSR         0x481
-#define MSR_IA32_VMX_PROCBASED_CTLS_MSR                0x482
-#define MSR_IA32_VMX_EXIT_CTLS_MSR             0x483
-#define MSR_IA32_VMX_ENTRY_CTLS_MSR            0x484
+#define MSR_IA32_VMX_PINBASED_CTLS             0x481
+#define MSR_IA32_VMX_PROCBASED_CTLS            0x482
+#define MSR_IA32_VMX_EXIT_CTLS         0x483
+#define MSR_IA32_VMX_ENTRY_CTLS                0x484
 
 #endif