* [tip: perf/core] perf tools: tools/include should come before tools/uapi/include
[not found] <tip-qzjqxa1wdrt51kwadyqawnuj@git.kernel.org>
@ 2019-08-23 2:44 ` tip-bot2 for Arnaldo Carvalho de Melo
0 siblings, 0 replies; only message in thread
From: tip-bot2 for Arnaldo Carvalho de Melo @ 2019-08-23 2:44 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, Arnaldo Carvalho de Melo, Namhyung Kim, Jiri Olsa,
Adrian Hunter
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 146dc303630aff5fdf006614a67704539c519c33
Gitweb: https://git.kernel.org/tip/146dc303630aff5fdf006614a67704539c519c33
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Mon, 19 Aug 2019 11:11:30 -03:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Tue, 20 Aug 2019 12:07:22 -03:00
perf tools: tools/include should come before tools/uapi/include
The next cset will grap const.h copies from the kernel to keep bits.h
in sync as it started to use linux/const.h, that in turn includes
uapi/linux/const.h.
So now we have a file with the same name in tools/include and
tools/uapi/include, and one includes the other, we need to have
tools/include/uapi/ after tools/include/ for this to work, fix it.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-qzjqxa1wdrt51kwadyqawnuj@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Makefile.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 9a06787..bf8caa7 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -280,9 +280,9 @@ endif
INC_FLAGS += -I$(src-perf)/lib/include
INC_FLAGS += -I$(src-perf)/util/include
INC_FLAGS += -I$(src-perf)/arch/$(SRCARCH)/include
-INC_FLAGS += -I$(srctree)/tools/include/uapi
INC_FLAGS += -I$(srctree)/tools/include/
INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi
+INC_FLAGS += -I$(srctree)/tools/include/uapi
INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/
INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-08-23 2:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <tip-qzjqxa1wdrt51kwadyqawnuj@git.kernel.org>
2019-08-23 2:44 ` [tip: perf/core] perf tools: tools/include should come before tools/uapi/include tip-bot2 for Arnaldo Carvalho de Melo
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).