From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932580AbcHITUc (ORCPT ); Tue, 9 Aug 2016 15:20:32 -0400 Received: from terminus.zytor.com ([198.137.202.10]:53168 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932207AbcHITUa (ORCPT ); Tue, 9 Aug 2016 15:20:30 -0400 Date: Tue, 9 Aug 2016 12:20:20 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, dsahern@gmail.com, wangnan0@huawei.com, tglx@linutronix.de, acme@redhat.com, namhyung@kernel.org, hpa@zytor.com, adrian.hunter@intel.com, dave.hansen@linux.intel.com, jolsa@kernel.org Reply-To: dsahern@gmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@kernel.org, dave.hansen@linux.intel.com, adrian.hunter@intel.com, hpa@zytor.com, namhyung@kernel.org, tglx@linutronix.de, acme@redhat.com, wangnan0@huawei.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tools: Sync cpufeatures headers with the kernel Git-Commit-ID: 840b49ba554b40fa8301ad2716abd2fe3d9e382a 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: 840b49ba554b40fa8301ad2716abd2fe3d9e382a Gitweb: http://git.kernel.org/tip/840b49ba554b40fa8301ad2716abd2fe3d9e382a Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 9 Aug 2016 11:56:33 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 9 Aug 2016 11:56:33 -0300 tools: Sync cpufeatures headers with the kernel Due to: 1e61f78baf89 ("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 ^C$ Cc: Adrian Hunter Cc: Dave Hansen Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-ja75m7zk8j0jkzmrv16i5ehw@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/arch/x86/include/asm/disabled-features.h | 2 ++ tools/arch/x86/include/asm/required-features.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index 911e935..85599ad 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -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 */ diff --git a/tools/arch/x86/include/asm/required-features.h b/tools/arch/x86/include/asm/required-features.h index 4916144..fac9a5c 100644 --- a/tools/arch/x86/include/asm/required-features.h +++ b/tools/arch/x86/include/asm/required-features.h @@ -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 */