* [tip:perf/core] perf jevents: Use nonlocal include statements in pmu-events.c
@ 2019-07-03 14:31 tip-bot for Luke Mujica
0 siblings, 0 replies; only message in thread
From: tip-bot for Luke Mujica @ 2019-07-03 14:31 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, jolsa, lukemujica, tglx, irogers, linux-kernel, hpa, mingo,
nums, eranian
Commit-ID: 06c642c0e9fceafd16b1a4c80d44b1c09e282215
Gitweb: https://git.kernel.org/tip/06c642c0e9fceafd16b1a4c80d44b1c09e282215
Author: Luke Mujica <lukemujica@google.com>
AuthorDate: Tue, 25 Jun 2019 10:31:22 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <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>
---
tools/perf/pmu-events/jevents.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index 58f77fd0f59f..a1184ea64cc6 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -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,
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-07-03 14:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-03 14:31 [tip:perf/core] perf jevents: Use nonlocal include statements in pmu-events.c tip-bot for Luke Mujica
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.