From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753340AbdHJQeK (ORCPT ); Thu, 10 Aug 2017 12:34:10 -0400 Received: from terminus.zytor.com ([65.50.211.136]:57389 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752460AbdHJQeG (ORCPT ); Thu, 10 Aug 2017 12:34:06 -0400 Date: Thu, 10 Aug 2017 09:28:12 -0700 From: tip-bot for Ingo Molnar Message-ID: Cc: linux-kernel@vger.kernel.org, mathieu.desnoyers@efficios.com, namhyung@kernel.org, sque@chromium.org, hpa@zytor.com, dsahern@gmail.com, pjt@google.com, francis.deslauriers@efficios.com, adrian.hunter@intel.com, ak@linux.intel.com, eranian@google.com, acme@redhat.com, jdesfossez@efficios.com, mingo@kernel.org, treeze.taeung@gmail.com, milian.wolff@kdab.com, davidcc@google.com, tglx@linutronix.de, mliska@suse.cz, jolsa@redhat.com, wangnan0@huawei.com, gbastien@versatic.net, alexander.shishkin@linux.intel.com, peterz@infradead.org Reply-To: francis.deslauriers@efficios.com, adrian.hunter@intel.com, mathieu.desnoyers@efficios.com, linux-kernel@vger.kernel.org, hpa@zytor.com, dsahern@gmail.com, namhyung@kernel.org, sque@chromium.org, pjt@google.com, mliska@suse.cz, davidcc@google.com, tglx@linutronix.de, jolsa@redhat.com, wangnan0@huawei.com, gbastien@versatic.net, alexander.shishkin@linux.intel.com, peterz@infradead.org, ak@linux.intel.com, jdesfossez@efficios.com, eranian@google.com, acme@redhat.com, treeze.taeung@gmail.com, mingo@kernel.org, milian.wolff@kdab.com In-Reply-To: <20170730095130.bblldwxjz5hamybb@gmail.com> References: <20170730095130.bblldwxjz5hamybb@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf build: Clarify open-coded header version warning message Git-Commit-ID: 8255e1efc193f110f1c9b8e40597a6c0c89fbedc 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: 8255e1efc193f110f1c9b8e40597a6c0c89fbedc Gitweb: http://git.kernel.org/tip/8255e1efc193f110f1c9b8e40597a6c0c89fbedc Author: Ingo Molnar AuthorDate: Sun, 30 Jul 2017 11:51:30 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 31 Jul 2017 10:30:06 -0300 perf build: Clarify open-coded header version warning message In this patch we changed the header checks: perf build: Clarify header version warning message Unfortunately the header checks were copied to various places and thus the message got out of sync. Fix some of them here. Note that there's still old, misleading messages remaining in: tools/objtool/Makefile: || echo "warning: objtool: x86 instruction decoder differs from kernel" >&2 )) || true tools/objtool/Makefile: || echo "warning: objtool: orc_types.h differs from kernel" >&2 )) || true here objtool copied the perf message, plus: tools/perf/util/intel-pt-decoder/Build: || echo "Warning: Intel PT: x86 instruction decoder differs from kernel" >&2 )) || true here the PT code regressed over the original message and only emits a vague warning instead of specific file names... All of this should be consolidated into tools/Build/ and used in a consistent manner. Signed-off-by: Ingo Molnar Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: David Ahern Cc: David Carrillo-Cisneros Cc: Francis Deslauriers Cc: Geneviève Bastien Cc: Jiri Olsa Cc: Julien Desfossez Cc: Martin Liška Cc: Mathieu Desnoyers Cc: Milian Wolff Cc: Namhyung Kim Cc: Paul Turner Cc: Peter Zijlstra Cc: Simon Que Cc: Stephane Eranian Cc: Taeung Song Cc: Wang Nan Link: http://lkml.kernel.org/r/20170730095130.bblldwxjz5hamybb@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/bpf/Makefile | 4 ++-- tools/perf/arch/x86/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 1f5300e..e87b590 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -156,10 +156,10 @@ all_cmd: $(CMD_TARGETS) $(BPF_IN): force elfdep bpfdep @(test -f ../../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \ (diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \ - echo "Warning: tools/include/uapi/linux/bpf.h differs from kernel" >&2 )) || true + echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'" >&2 )) || true @(test -f ../../../include/uapi/linux/bpf_common.h -a -f ../../../include/uapi/linux/bpf_common.h && ( \ (diff -B ../../include/uapi/linux/bpf_common.h ../../../include/uapi/linux/bpf_common.h >/dev/null) || \ - echo "Warning: tools/include/uapi/linux/bpf_common.h differs from kernel" >&2 )) || true + echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf_common.h' differs from latest version at 'include/uapi/linux/bpf_common.h'" >&2 )) || true $(Q)$(MAKE) $(build)=libbpf $(OUTPUT)libbpf.so: $(BPF_IN) diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile index 6c9211b..9a628a2 100644 --- a/tools/perf/arch/x86/Makefile +++ b/tools/perf/arch/x86/Makefile @@ -20,7 +20,7 @@ _dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)') $(header): $(sys)/syscall_64.tbl $(systbl) @(test -d ../../kernel -a -d ../../tools -a -d ../perf && ( \ (diff -B arch/x86/entry/syscalls/syscall_64.tbl ../../arch/x86/entry/syscalls/syscall_64.tbl >/dev/null) \ - || echo "Warning: x86_64's syscall_64.tbl differs from kernel" >&2 )) || true + || echo "Warning: Kernel ABI header at 'tools/arch/x86/entry/syscalls/syscall_64.tbl' differs from latest version at 'arch/x86/entry/syscalls/syscall_64.tbl'" >&2 )) || true $(Q)$(SHELL) '$(systbl)' $(sys)/syscall_64.tbl 'x86_64' > $@ clean::