Commit a5c4c745 authored Oct 05, 2016 by Arnaldo Carvalho de Melo

tools: Synchronize tools/arch/x86/include/asm/cpufeatures.h

Due to ffb173e6 ("x86/mce: Drop X86_FEATURE_MCE_RECOVERY and the
related model string test"), no changes needed in any other place as no
tool uses X86_FEATURE_MCE_RECOVERY.

Silences this detected drift when building tools/perf:

      Warning: tools/arch/x86/include/asm/cpufeatures.h differs from kernel

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-f3sfimg58t3cycbbl8f5cwxf@git.kernel.org

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

parent d23e354f

tools/arch/x86/include/asm/cpufeatures.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,6 @@
		#define X86_FEATURE_APERFMPERF ( 332+28) / APERFMPERF */
		#define X86_FEATURE_EAGER_FPU ( 332+29) / "eagerfpu" Non lazy FPU restore */
		#define X86_FEATURE_NONSTOP_TSC_S3 ( 332+30) / TSC doesn't stop in S3 state */
		#define X86_FEATURE_MCE_RECOVERY ( 332+31) / cpu has recoverable machine checks */

		/* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
		#define X86_FEATURE_XMM3 ( 432+ 0) / "pni" SSE-3 */