Commit 840b49ba authored Aug 09, 2016 by Arnaldo Carvalho de Melo

tools: Sync cpufeatures headers with the kernel

Due to:

  1e61f78b ("x86/cpufeature: Make sure DISABLED/REQUIRED macros are updated")

No changes to tools using those headers (tools/arch/x86/lib/mem{set,cpu}_64.S)
seems necessary.

Detected by the tools build header drift checker:

  $ make -C tools/perf O=/tmp/build/perf
  make: Entering directory '/home/acme/git/linux/tools/perf'
    BUILD:   Doing 'make -j4' parallel build
    GEN      /tmp/build/perf/common-cmds.h
  Warning: tools/arch/x86/include/asm/disabled-features.h differs from kernel
  Warning: tools/arch/x86/include/asm/required-features.h differs from kernel
  Warning: tools/arch/x86/include/asm/cpufeatures.h differs from kernel
    CC       /tmp/build/perf/util/probe-finder.o
    CC       /tmp/build/perf/builtin-help.o
  <SNIP>
  ^C$

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-ja75m7zk8j0jkzmrv16i5ehw@git.kernel.org


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

parent 791cceb8

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -56,5 +56,7 @@
		#define DISABLED_MASK14 0
		#define DISABLED_MASK15 0
		#define DISABLED_MASK16 (DISABLE_PKU\|DISABLE_OSPKE)
		#define DISABLED_MASK17 0
		#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)

		#endif /* _ASM_X86_DISABLED_FEATURES_H */

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -99,5 +99,7 @@
		#define REQUIRED_MASK14 0
		#define REQUIRED_MASK15 0
		#define REQUIRED_MASK16 0
		#define REQUIRED_MASK17 0
		#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)

		#endif /* _ASM_X86_REQUIRED_FEATURES_H */