summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2019-12-16 13:22:33 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-03-05 16:43:49 +0100
commit27f7e492d8fe6a53a0a7afe0c989f2fe61417e90 (patch)
tree53dcec9f252925e49037e2d589435445d8d65ca9
parentf68b6a015a811ffc072d61f3ba1ba32bbc018612 (diff)
downloadlinux-stable-27f7e492d8fe6a53a0a7afe0c989f2fe61417e90.tar.gz
linux-stable-27f7e492d8fe6a53a0a7afe0c989f2fe61417e90.tar.bz2
linux-stable-27f7e492d8fe6a53a0a7afe0c989f2fe61417e90.zip
perf hists browser: Restore ESC as "Zoom out" of DSO/thread/etc
commit 3f7774033e6820d25beee5cf7aefa11d4968b951 upstream. We need to set actions->ms.map since 599a2f38a989 ("perf hists browser: Check sort keys before hot key actions"), as in that patch we bail out if map is NULL. Reviewed-by: Jiri Olsa <jolsa@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Fixes: 599a2f38a989 ("perf hists browser: Check sort keys before hot key actions") Link: https://lkml.kernel.org/n/tip-wp1ssoewy6zihwwexqpohv0j@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--tools/perf/ui/browsers/hists.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 7a7187e069b4..88c3df24b748 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -3054,6 +3054,7 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events,
continue;
}
+ actions->ms.map = map;
top = pstack__peek(browser->pstack);
if (top == &browser->hists->dso_filter) {
/*