diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-03-06 14:49:56 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-03-06 14:49:56 +0300 |
| commit | 1b10d388d094bb32129060236add6f50b204a69d (patch) | |
| tree | 08272a4d89833d139e615b07675f95e403cdddbd /tools/perf/ui/browsers/annotate.c | |
| parent | a0f03b617c3b2644d3d47bf7d9e60aed01bd5b10 (diff) | |
| parent | 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 (diff) | |
| download | linux-1b10d388d094bb32129060236add6f50b204a69d.tar.xz | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/ui/browsers/annotate.c')
| -rw-r--r-- | tools/perf/ui/browsers/annotate.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index badbddbb30f8..9023267e5643 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -754,10 +754,9 @@ static int annotate_browser__run(struct annotate_browser *browser, "? Search string backwards\n"); continue; case 'r': - { - script_browse(NULL, NULL); - continue; - } + script_browse(NULL, NULL); + annotate_browser__show(&browser->b, title, help); + continue; case 'k': notes->options->show_linenr = !notes->options->show_linenr; break; @@ -834,13 +833,13 @@ show_sup_ins: map_symbol__annotation_dump(ms, evsel, browser->opts); continue; case 't': - if (notes->options->show_total_period) { - notes->options->show_total_period = false; - notes->options->show_nr_samples = true; - } else if (notes->options->show_nr_samples) - notes->options->show_nr_samples = false; + if (symbol_conf.show_total_period) { + symbol_conf.show_total_period = false; + symbol_conf.show_nr_samples = true; + } else if (symbol_conf.show_nr_samples) + symbol_conf.show_nr_samples = false; else - notes->options->show_total_period = true; + symbol_conf.show_total_period = true; annotation__update_column_widths(notes); continue; case 'c': |