From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
"Daniel Díaz" <daniel.diaz@linaro.org>,
"Peter Zijlstra" <peterz@infradead.org>,
"Arnaldo Carvalho de Melo" <acme@redhat.com>
Subject: [PATCH 01/13] tools lib bpf: Fix double file test in Makefile
Date: Mon, 21 Aug 2017 16:25:37 -0300 [thread overview]
Message-ID: <20170821192549.17251-2-acme@kernel.org> (raw)
In-Reply-To: <20170821192549.17251-1-acme@kernel.org>
From: Daniel Díaz <daniel.diaz@linaro.org>
The Makefile verifies the same file exists twice:
test -f ../../../include/uapi/linux/bpf.h -a \
-f ../../../include/uapi/linux/bpf.h
The purpose of the check is to ensure the diff (immediately after the
test) doesn't fail with these two files:
tools/include/uapi/linux/bpf.h
include/uapi/linux/bpf.h
Same recipe for bpf_common:
test -f ../../../include/uapi/linux/bpf_common.h -a \
-f ../../../include/uapi/linux/bpf_common.h
This corrects the location of the tests.
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1502814810-960-1-git-send-email-daniel.diaz@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/bpf/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
index e87b5903f4bb..4ed0257dc1f3 100644
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -154,10 +154,10 @@ all: fixdep $(VERSION_FILES) all_cmd
all_cmd: $(CMD_TARGETS)
$(BPF_IN): force elfdep bpfdep
- @(test -f ../../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \
+ @(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: 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 && ( \
+ @(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: 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
--
2.13.5
next prev parent reply other threads:[~2017-08-21 19:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-21 19:25 [GIT PULL 00/13] perf/core improvements and fixes Arnaldo Carvalho de Melo
2017-08-21 19:25 ` Arnaldo Carvalho de Melo [this message]
2017-08-21 19:25 ` [PATCH 02/13] perf jevents: Support FCMask and PortMask Arnaldo Carvalho de Melo
2017-08-21 19:25 ` [PATCH 03/13] perf trace: Fix off by one string allocation problem Arnaldo Carvalho de Melo
2017-08-21 19:25 ` [PATCH 04/13] perf events parse: Remove some needless local variables Arnaldo Carvalho de Melo
2017-08-21 19:25 ` [PATCH 05/13] perf events parse: Rename parsing state struct to clearer name Arnaldo Carvalho de Melo
2017-08-21 19:25 ` [PATCH 06/13] perf events parse: Use just one parse events state struct Arnaldo Carvalho de Melo
2017-08-21 19:25 ` [PATCH 07/13] perf events parse: Rename parse_events_parse arguments Arnaldo Carvalho de Melo
2017-08-21 19:25 ` [PATCH 08/13] perf tools: Remove unused cpu_relax() macros Arnaldo Carvalho de Melo
2017-08-21 19:25 ` [PATCH 09/13] perf tools: Use default CPUINFO_PROC where it fits Arnaldo Carvalho de Melo
2017-08-21 19:25 ` [PATCH 10/13] perf annotate stdio: Support --show-nr-samples option Arnaldo Carvalho de Melo
2017-08-21 19:25 ` [PATCH 11/13] perf annotate: Document --show-total-period option Arnaldo Carvalho de Melo
2017-08-21 19:25 ` [PATCH 12/13] perf annotate browser: Support --show-nr-samples option Arnaldo Carvalho de Melo
2017-08-21 19:25 ` [PATCH 13/13] perf annotate browser: Circulate percent, total-period and nr-samples view Arnaldo Carvalho de Melo
2017-08-22 10:20 ` [GIT PULL 00/13] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170821192549.17251-2-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=daniel.diaz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).