Skip to content

Commit 7636b58

Browse files
committed
tools headers x86: Sync disabled-features.h
To silence the following tools/perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/asm/disabled-features.h' differs from latest version at 'arch/x86/include/asm/disabled-features.h' diff -u tools/arch/x86/include/asm/disabled-features.h arch/x86/include/asm/disabled-features.h Picking up the changes in: 45fc24e ("x86/mpx: remove MPX from arch/x86") that didn't entail any functionality change in the tooling side. Cc: Adrian Hunter <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 8c65582 commit 7636b58

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

tools/arch/x86/include/asm/disabled-features.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010
* cpu_feature_enabled().
1111
*/
1212

13-
#ifdef CONFIG_X86_INTEL_MPX
14-
# define DISABLE_MPX 0
15-
#else
16-
# define DISABLE_MPX (1<<(X86_FEATURE_MPX & 31))
17-
#endif
18-
1913
#ifdef CONFIG_X86_SMAP
2014
# define DISABLE_SMAP 0
2115
#else
@@ -74,7 +68,7 @@
7468
#define DISABLED_MASK6 0
7569
#define DISABLED_MASK7 (DISABLE_PTI)
7670
#define DISABLED_MASK8 0
77-
#define DISABLED_MASK9 (DISABLE_MPX|DISABLE_SMAP)
71+
#define DISABLED_MASK9 (DISABLE_SMAP)
7872
#define DISABLED_MASK10 0
7973
#define DISABLED_MASK11 0
8074
#define DISABLED_MASK12 0

0 commit comments

Comments
 (0)