diff options
| author | Dave Hansen <dave.hansen@linux.intel.com> | 2014-09-11 23:15:24 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-09-11 23:30:17 +0200 |
| commit | 9298b815efe500b272e4084ed05eeae7a92b5340 (patch) | |
| tree | 7ea33c7d7576125749453b793ccb2143140d14a8 /arch/x86/kernel/cpu/common.c | |
| parent | x86: Introduce disabled-features (diff) | |
| download | linux-9298b815efe500b272e4084ed05eeae7a92b5340.tar.xz linux-9298b815efe500b272e4084ed05eeae7a92b5340.zip | |
x86: Add more disabled features
The original motivation for these patches was for an Intel CPU
feature called MPX. The patch to add a disabled feature for it
will go in with the other parts of the support.
But, in the meantime, there are a few other features than MPX
that we can make assumptions about at compile-time based on
compile options. Add them to disabled-features.h and check them
with cpu_feature_enabled().
Note that this gets rid of the last things that needed an #ifdef
CONFIG_X86_64 in cpufeature.h. Yay!
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: http://lkml.kernel.org/r/20140911211524.C0EC332A@viggo.jf.intel.com
Acked-by: Borislav Petkov <bp@suse.de>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index e4ab2b42bd6f..724d221107eb 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1391,7 +1391,7 @@ void cpu_init(void) printk(KERN_INFO "Initializing CPU#%d\n", cpu); - if (cpu_has_vme || cpu_has_tsc || cpu_has_de) + if (cpu_feature_enabled(X86_FEATURE_VME) || cpu_has_tsc || cpu_has_de) clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE); load_current_idt(); |