linux-kernel - [tip:perf/core] perf jevents: Use nonlocal include statements in pmu-events.c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <tip-prgnwmaoo1pv9zz4vnv1bjaj@git.kernel.org>
Date:   Wed, 3 Jul 2019 07:31:29 -0700
From:   tip-bot for Luke Mujica <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     acme@...hat.com, jolsa@...hat.com, lukemujica@...gle.com,
        tglx@...utronix.de, irogers@...gle.com,
        linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
        nums@...gle.com, eranian@...gle.com
Subject: [tip:perf/core] perf jevents: Use nonlocal include statements in
 pmu-events.c

Commit-ID:  06c642c0e9fceafd16b1a4c80d44b1c09e282215
Gitweb:     https://git.kernel.org/tip/06c642c0e9fceafd16b1a4c80d44b1c09e282215
Author:     Luke Mujica <lukemujica@...gle.com>
AuthorDate: Tue, 25 Jun 2019 10:31:22 -0700
Committer:  Arnaldo Carvalho de Melo <acme@...hat.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@...gle.com>
Cc: Ian Rogers <irogers@...gle.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Numfor Mbiziwo-Tiapo <nums@...gle.com>
Cc: Stephane Eranian <eranian@...gle.com>
Link: https://lkml.kernel.org/n/tip-prgnwmaoo1pv9zz4vnv1bjaj@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.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,