Merge tag 'for-f2fs-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[firefly-linux-kernel-4.4.55.git] / tools / perf / builtin-timechart.c

diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index 35b425b6293f759b5119d8fb6a07d2ab2303d6f7..f3bb1a4bf060c4a6ad2347f7f40b321916669533 100644 (file)
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -528,7 +528,7 @@ static const char *cat_backtrace(union perf_event *event,
                }
 
                tal.filtered = 0;
-               thread__find_addr_location(al.thread, machine, cpumode,
+               thread__find_addr_location(al.thread, cpumode,
                                           MAP__FUNCTION, ip, &tal);
 
                if (tal.sym)
@@ -1963,7 +1963,7 @@ int cmd_timechart(int argc, const char **argv,
                NULL
        };
 
-       const struct option record_options[] = {
+       const struct option timechart_record_options[] = {
        OPT_BOOLEAN('P', "power-only", &tchart.power_only, "output power data only"),
        OPT_BOOLEAN('T', "tasks-only", &tchart.tasks_only,
                    "output processes data only"),
@@ -1972,7 +1972,7 @@ int cmd_timechart(int argc, const char **argv,
        OPT_BOOLEAN('g', "callchain", &tchart.with_backtrace, "record callchain"),
        OPT_END()
        };
-       const char * const record_usage[] = {
+       const char * const timechart_record_usage[] = {
                "perf timechart record [<options>]",
                NULL
        };
@@ -1985,7 +1985,8 @@ int cmd_timechart(int argc, const char **argv,
        }
 
        if (argc && !strncmp(argv[0], "rec", 3)) {
-               argc = parse_options(argc, argv, record_options, record_usage,
+               argc = parse_options(argc, argv, timechart_record_options,
+                                    timechart_record_usage,
                                     PARSE_OPT_STOP_AT_NON_OPTION);
 
                if (tchart.power_only && tchart.tasks_only) {