Commit 06c642c0 authored Jun 25, 2019 by Luke Mujica Committed by Arnaldo Carvalho de Melo Jul 01, 2019

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 <lukemujica@google.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Numfor Mbiziwo-Tiapo <nums@google.com>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lkml.kernel.org/n/tip-prgnwmaoo1pv9zz4vnv1bjaj@git.kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent aa23aa55

tools/perf/pmu-events/jevents.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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,

Admin message