tools headers x86: Sync disabled-features.h
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 94f45df8aaa35471ab3fc802c2cf1b75c8107500 Gitweb: https://git.kernel.org/tip/94f45df8aaa35471ab3fc802c2cf1b75c8107500 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 3 Jan 2019 13:53:59 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 3 Jan 2019 13:53:59 -0300
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 dae0a1059300 ("x86/cpufeatures, x86/fault:
Mark SMAP as disabled when configured out") that didn't entail any functionality change in the tooling side.
Cc Adrian Hunter <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/arch/x86/include/asm/disabled-features.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/arch/x86/include/asm/disabled-features.h +7 -1
@@ -16,6 +16,12 @@# define DISABLE_MPX (1<<(X86_FEATURE_MPX & 31))#endif +#ifdef CONFIG_X86_SMAP +# define DISABLE_SMAP 0 +#else +# define DISABLE_SMAP (1<<(X86_FEATURE_SMAP & 31)) +#endif +#ifdef CONFIG_X86_INTEL_UMIP # define DISABLE_UMIP 0#else
@@ -68,7 +74,7 @@#define DISABLED_MASK6 0#define DISABLED_MASK7 (DISABLE_PTI)#define DISABLED_MASK8 0 -#define DISABLED_MASK9 (DISABLE_MPX) +#define DISABLED_MASK9 (DISABLE_MPX|DISABLE_SMAP)#define DISABLED_MASK10 0#define DISABLED_MASK11 0#define DISABLED_MASK12 0