diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-03-06 12:49:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-03-06 12:49:56 +0100 |
| commit | 1b10d388d094bb32129060236add6f50b204a69d (patch) | |
| tree | 08272a4d89833d139e615b07675f95e403cdddbd /tools/perf/builtin-annotate.c | |
| parent | a0f03b617c3b2644d3d47bf7d9e60aed01bd5b10 (diff) | |
| parent | 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index ff61795a4d137..6c0a0412502eb 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -566,6 +566,8 @@ int cmd_annotate(int argc, const char **argv) if (ret < 0) return ret; + annotation_config__init(&annotate.opts); + argc = parse_options(argc, argv, options, annotate_usage, 0); if (argc) { /* @@ -605,8 +607,6 @@ int cmd_annotate(int argc, const char **argv) if (ret < 0) goto out_delete; - annotation_config__init(); - symbol_conf.try_vmlinux_path = true; ret = symbol__init(&annotate.session->header.env); |