tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Arnaldo Carvalho de Melo 146dc303 6e98bc34

+1 -1
+1 -1
tools/perf/Makefile.config
··· 280 280 INC_FLAGS += -I$(src-perf)/lib/include 281 281 INC_FLAGS += -I$(src-perf)/util/include 282 282 INC_FLAGS += -I$(src-perf)/arch/$(SRCARCH)/include 283 - INC_FLAGS += -I$(srctree)/tools/include/uapi 284 283 INC_FLAGS += -I$(srctree)/tools/include/ 285 284 INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi 285 + INC_FLAGS += -I$(srctree)/tools/include/uapi 286 286 INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/ 287 287 INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/ 288 288