]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
perf jevents: Use nonlocal include statements in pmu-events.c
authorLuke Mujica <lukemujica@google.com>
Tue, 25 Jun 2019 17:31:22 +0000 (10:31 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 2 Jul 2019 01:50:42 +0000 (22:50 -0300)
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

index 58f77fd0f59fe82700491f1b22c803e57ca089cb..a1184ea64cc6e83c7cf741b4753bfd842522002c 100644 (file)
@@ -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,