From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935574AbcJFWm7 (ORCPT ); Thu, 6 Oct 2016 18:42:59 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46412 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935054AbcJFWmw (ORCPT ); Thu, 6 Oct 2016 18:42:52 -0400 Date: Thu, 6 Oct 2016 15:42:41 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@redhat.com, tony.luck@intel.com, jolsa@kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, adrian.hunter@intel.com, wangnan0@huawei.com, dsahern@gmail.com Reply-To: hpa@zytor.com, mingo@kernel.org, acme@redhat.com, tony.luck@intel.com, jolsa@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, dsahern@gmail.com, adrian.hunter@intel.com, wangnan0@huawei.com, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tools: Synchronize tools/arch/x86/include/asm/cpufeatures.h Git-Commit-ID: a5c4c74564f000950902d0f1e64926cce2280af2 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a5c4c74564f000950902d0f1e64926cce2280af2 Gitweb: http://git.kernel.org/tip/a5c4c74564f000950902d0f1e64926cce2280af2 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 5 Oct 2016 19:18:34 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Thomas Gleixner Cc: Tony Luck Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-f3sfimg58t3cycbbl8f5cwxf@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 */