From c6a6a73b40297fe5fdb9fae60f6413981c5e7571 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Thu, 11 Sep 2008 15:27:50 +0800 Subject: [PATCH] --- yaml --- r: 115315 b: refs/heads/master c: defed7ed926eca9f178a632df05baa866abe754e h: refs/heads/master i: 115313: 6badb5a705d2fc7767812e5c9ac33a5bbbed6c36 115311: 1d88f637cb94cb4777777a7550fe5b5be959c487 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.h | 3 --- trunk/include/asm-x86/msr-index.h | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ac6f854e6f99..52fe7d3e49d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ea542facbd0fd12a53e169953a3fdd6d0364532 +refs/heads/master: defed7ed926eca9f178a632df05baa866abe754e diff --git a/trunk/arch/x86/kvm/vmx.h b/trunk/arch/x86/kvm/vmx.h index 44cfab706443..3e010d21fdd7 100644 --- a/trunk/arch/x86/kvm/vmx.h +++ b/trunk/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/trunk/include/asm-x86/msr-index.h b/trunk/include/asm-x86/msr-index.h index 0bb43301a202..dabd10f0bbee 100644 --- a/trunk/include/asm-x86/msr-index.h +++ b/trunk/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)