Merge tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[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 494b3bbe5ea430c3711f0e4ec00a8353c61260a1..e50fe1187b0ba2ca808f6c0a0d3effd8156b4982 100644 (file)
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -67,6 +67,7 @@ struct timechart {
                                skip_eagain;
        u64                     min_time,
                                merge_dist;
+       bool                    force;
 };
 
 struct per_pidcomm;
@@ -1598,6 +1599,7 @@ static int __cmd_timechart(struct timechart *tchart, const char *output_name)
        struct perf_data_file file = {
                .path = input_name,
                .mode = PERF_DATA_MODE_READ,
+               .force = tchart->force,
        };
 
        struct perf_session *session = perf_session__new(&file, false,
@@ -1956,6 +1958,7 @@ int cmd_timechart(int argc, const char **argv,
        OPT_CALLBACK(0, "io-merge-dist", &tchart.merge_dist, "time",
                     "merge events that are merge-dist us apart",
                     parse_time),
+       OPT_BOOLEAN('f', "force", &tchart.force, "don't complain, do it"),
        OPT_END()
        };
        const char * const timechart_subcommands[] = { "record", NULL };