diff options
| author | Dave Hansen <dave.hansen@linux.intel.com> | 2020-01-23 10:41:20 -0800 |
|---|---|---|
| committer | Dave Hansen <dave.hansen@intel.com> | 2020-01-23 10:41:20 -0800 |
| commit | 45fc24e89b7cc2e227b2f03d99dda0a2204bf383 (patch) | |
| tree | 913d1b90a3a490d3290e93d38e28ed8ddae2896a /arch/x86/include/asm/disabled-features.h | |
| parent | 42222eae17f7c930833dfda7896ef280879de94a (diff) | |
| download | linux-stable-45fc24e89b7cc2e227b2f03d99dda0a2204bf383.tar.gz linux-stable-45fc24e89b7cc2e227b2f03d99dda0a2204bf383.tar.bz2 linux-stable-45fc24e89b7cc2e227b2f03d99dda0a2204bf383.zip | |
x86/mpx: remove MPX from arch/x86
From: Dave Hansen <dave.hansen@linux.intel.com>
MPX is being removed from the kernel due to a lack of support
in the toolchain going forward (gcc).
This removes all the remaining (dead at this point) MPX handling
code remaining in the tree. The only remaining code is the XSAVE
support for MPX state which is currently needd for KVM to handle
VMs which might use MPX.
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: x86@kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/disabled-features.h')
| -rw-r--r-- | arch/x86/include/asm/disabled-features.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h index a5ea841cc6d2..41d069fa8f2f 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -10,12 +10,6 @@ * cpu_feature_enabled(). */ -#ifdef CONFIG_X86_INTEL_MPX -# define DISABLE_MPX 0 -#else -# define DISABLE_MPX (1<<(X86_FEATURE_MPX & 31)) -#endif - #ifdef CONFIG_X86_SMAP # define DISABLE_SMAP 0 #else @@ -74,7 +68,7 @@ #define DISABLED_MASK6 0 #define DISABLED_MASK7 (DISABLE_PTI) #define DISABLED_MASK8 0 -#define DISABLED_MASK9 (DISABLE_MPX|DISABLE_SMAP) +#define DISABLED_MASK9 (DISABLE_SMAP) #define DISABLED_MASK10 0 #define DISABLED_MASK11 0 #define DISABLED_MASK12 0 |