perf jevents: Use nonlocal include statements in pmu-events.c
tip-bot for Luke Mujica
merge botCommit-ID: 06c642c0e9fceafd16b1a4c80d44b1c09e282215 Gitweb: https://git.kernel.org/tip/06c642c0e9fceafd16b1a4c80d44b1c09e282215 Author: Luke Mujica <[email protected]> AuthorDate: Tue, 25 Jun 2019 10:31:22 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Jul 2019 22:50:42 -0300
perf jevents: Use nonlocal include statements in pmu-events.c
Change pmu-events.c to not use local include statements. The code that creates the include statements for pmu-events.c is in jevents.c.
pmu-events.c is a generated file, and for build systems that put generated files in a separate directory, include statements with local pathing cannot find non-generated files.
Signed-off-by Luke Mujica <[email protected]>
Cc Ian Rogers <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Numfor Mbiziwo-Tiapo <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/pmu-events/jevents.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/pmu-events/jevents.c +2 -2
@@ -841,7 +841,7 @@ static void create_empty_mapping(const char *output_file)_Exit (1 ); } -fprintf (outfp,"#include \"../../pmu-events/pmu-events.h\"\n" ); +fprintf (outfp,"#include \"pmu-events/pmu-events.h\"\n" );print_mapping_table_prefix (outfp);print_mapping_table_suffix (outfp);fclose (outfp);
@@ -1096,7 +1096,7 @@ int main(int argc, char *argv[]) }/* Include pmu-events.h first */ -fprintf (eventsfp,"#include \"../../pmu-events/pmu-events.h\"\n" ); +fprintf (eventsfp,"#include \"pmu-events/pmu-events.h\"\n" );/* * The mapfile allows multiple CPUids to point to the same JSON file,