Commit 94f45df8 authored Jan 03, 2019 by Arnaldo Carvalho de Melo

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 dae0a105 ("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 <adrian.hunter@intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-vvge5xh6ii12oszexqknbgwp@git.kernel.org

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 8a99255a

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message