From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937282AbdLRRTs (ORCPT ); Mon, 18 Dec 2017 12:19:48 -0500 Received: from terminus.zytor.com ([65.50.211.136]:39443 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933992AbdLRRTl (ORCPT ); Mon, 18 Dec 2017 12:19:41 -0500 Date: Mon, 18 Dec 2017 09:17:16 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, wangnan0@huawei.com, dsahern@gmail.com, brueckner@linux.vnet.ibm.com, jolsa@kernel.org, heiko.carstens@de.ibm.com, schwidefsky@de.ibm.com, acme@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, tmricht@linux.vnet.ibm.com, namhyung@kernel.org, tglx@linutronix.de Reply-To: heiko.carstens@de.ibm.com, jolsa@kernel.org, dsahern@gmail.com, wangnan0@huawei.com, hpa@zytor.com, brueckner@linux.vnet.ibm.com, tglx@linutronix.de, tmricht@linux.vnet.ibm.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, mingo@kernel.org, acme@redhat.com, schwidefsky@de.ibm.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tools arch s390: Do not include header files from the kernel sources Git-Commit-ID: 10b9baa701d5023897f70a4acb3bf0235da3dc4f 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: 10b9baa701d5023897f70a4acb3bf0235da3dc4f Gitweb: https://git.kernel.org/tip/10b9baa701d5023897f70a4acb3bf0235da3dc4f Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 28 Nov 2017 11:08:41 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 18 Dec 2017 11:56:13 -0300 tools arch s390: Do not include header files from the kernel sources Long ago we decided to be verbotten including files in the kernel git sources from tools/ living source code, to avoid disturbing kernel development (and perf's and other tools/) when, say, a kernel hacker adds something, tests everything but tools/ and have tools/ build broken. This got broken recently by s/390, fix it by copying arch/s390/include/uapi/asm/perf_regs.h to tools/arch/s390/include/uapi/asm/, making this one be used by means of and updating tools/perf/check_headers.sh to make sure we are notified when the original changes, so that we can check if anything is needed on the tooling side. This would have been caught by the 'tarkpg' test entry in: $ make -C tools/perf build-test When run on a s/390 build system or container. Acked-by: Heiko Carstens Cc: Hendrik Brueckner Cc: Thomas Richter Cc: Martin Schwidefsky Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Fixes: f704ef44602f ("s390/perf: add support for perf_regs and libdw") Link: https://lkml.kernel.org/n/tip-n57139ic0v9uffx8wdqi3d8a@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- {arch => tools/arch}/s390/include/uapi/asm/perf_regs.h | 0 tools/perf/arch/s390/include/perf_regs.h | 2 +- tools/perf/check-headers.sh | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/s390/include/uapi/asm/perf_regs.h b/tools/arch/s390/include/uapi/asm/perf_regs.h similarity index 100% copy from arch/s390/include/uapi/asm/perf_regs.h copy to tools/arch/s390/include/uapi/asm/perf_regs.h diff --git a/tools/perf/arch/s390/include/perf_regs.h b/tools/perf/arch/s390/include/perf_regs.h index d2df54a..bcfbaed 100644 --- a/tools/perf/arch/s390/include/perf_regs.h +++ b/tools/perf/arch/s390/include/perf_regs.h @@ -3,7 +3,7 @@ #include #include -#include <../../../../arch/s390/include/uapi/asm/perf_regs.h> +#include void perf_regs_load(u64 *regs); diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh index 6db9d80..3e64f10 100755 --- a/tools/perf/check-headers.sh +++ b/tools/perf/check-headers.sh @@ -21,6 +21,7 @@ arch/x86/include/asm/cpufeatures.h arch/arm/include/uapi/asm/perf_regs.h arch/arm64/include/uapi/asm/perf_regs.h arch/powerpc/include/uapi/asm/perf_regs.h +arch/s390/include/uapi/asm/perf_regs.h arch/x86/include/uapi/asm/perf_regs.h arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm_perf.h