summaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-annotate.c
diff options
context:
space:
mode:
authorMartin Liška <mliska@suse.cz>2015-05-29 14:06:44 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-05-29 12:43:34 -0300
commit44848cdbbd1bacbac2a825920b699adc000d51c7 (patch)
tree2759c8238e1c3721957ddded0b274e3043033384 /tools/perf/builtin-annotate.c
parentf1942b96b4b44c1ab0e0b82fef93ba7e1fada7af (diff)
downloadlinux-44848cdbbd1bacbac2a825920b699adc000d51c7.tar.bz2
perf annotate: Fix -i option, which is currently ignored.
Assign input_name, received from program arguments, to file data structure. Signed-off-by: Martin Liska <mliska@suse.cz> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/55685654.2010209@suse.cz Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
-rw-r--r--tools/perf/builtin-annotate.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index c434e1264087..4e08c2d2090e 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -289,7 +289,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused)
},
};
struct perf_data_file file = {
- .path = input_name,
.mode = PERF_DATA_MODE_READ,
};
const struct option options[] = {
@@ -346,6 +345,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused)
else if (annotate.use_gtk)
use_browser = 2;
+ file.path = input_name;
+
setup_browser(true);
annotate.session = perf_session__new(&file, false, &annotate.tool);