Commit-ID: a5c4c74564f000950902d0f1e64926cce2280af2
Gitweb: http://git.kernel.org/tip/a5c4c74564f000950902d0f1e64926cce2280af2
Author: Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 5 Oct 2016 19:18:34 -0300
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 5 Oct 2016 19:18:34 -0300
tools: Synchronize tools/arch/x86/include/asm/cpufeatures.h
Due to ffb173e657fa ("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 <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Wang Nan <[email protected]>
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/arch/x86/include/asm/cpufeatures.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/arch/x86/include/asm/cpufeatures.h
b/tools/arch/x86/include/asm/cpufeatures.h
index 92a8308..1188bc8 100644
--- a/tools/arch/x86/include/asm/cpufeatures.h
+++ b/tools/arch/x86/include/asm/cpufeatures.h
@@ -106,7 +106,6 @@
#define X86_FEATURE_APERFMPERF ( 3*32+28) /* APERFMPERF */
#define X86_FEATURE_EAGER_FPU ( 3*32+29) /* "eagerfpu" Non lazy FPU restore */
#define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30) /* TSC doesn't stop in S3 state
*/
-#define X86_FEATURE_MCE_RECOVERY ( 3*32+31) /* cpu has recoverable machine
checks */
/* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
#define X86_FEATURE_XMM3 ( 4*32+ 0) /* "pni" SSE-3 */
