diff options
| author | Sheng Yang <sheng.yang@intel.com> | 2008-09-11 15:27:50 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-10-15 10:16:14 +0200 |
| commit | defed7ed926eca9f178a632df05baa866abe754e (patch) | |
| tree | 840967616f6fcd696c62ed9f8328fe671bdea18b | |
| parent | 9ea542facbd0fd12a53e169953a3fdd6d0364532 (diff) | |
| download | kernel_samsung_tuna-defed7ed926eca9f178a632df05baa866abe754e.zip kernel_samsung_tuna-defed7ed926eca9f178a632df05baa866abe754e.tar.gz kernel_samsung_tuna-defed7ed926eca9f178a632df05baa866abe754e.tar.bz2 | |
x86: Move FEATURE_CONTROL bits to msr-index.h
For MSR_IA32_FEATURE_CONTROL is already there.
Signed-off-by: Sheng Yang <sheng.yang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | arch/x86/kvm/vmx.h | 3 | ||||
| -rw-r--r-- | include/asm-x86/msr-index.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h index 44cfab7..3e010d2 100644 --- a/arch/x86/kvm/vmx.h +++ b/arch/x86/kvm/vmx.h @@ -331,9 +331,6 @@ enum vmcs_field { #define AR_RESERVD_MASK 0xfffe0f00 -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED (1<<2) - #define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT 9 #define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT 10 diff --git a/include/asm-x86/msr-index.h b/include/asm-x86/msr-index.h index 0bb4330..dabd10f 100644 --- a/include/asm-x86/msr-index.h +++ b/include/asm-x86/msr-index.h @@ -178,6 +178,9 @@ #define MSR_IA32_EBL_CR_POWERON 0x0000002a #define MSR_IA32_FEATURE_CONTROL 0x0000003a +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED (1<<2) + #define MSR_IA32_APICBASE 0x0000001b #define MSR_IA32_APICBASE_BSP (1<<8) #define MSR_IA32_APICBASE_ENABLE (1<<11) |