diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-16 07:19:56 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-16 07:19:56 (GMT) |
| commit | d71b0ad8d30922ccdd0705318237e6890b4ec1b6 (patch) | |
| tree | 347c773357c1afc87d65f767258317164bc0e31e /tools/perf/ui | |
| parent | a4d71093e759b7cfe0babbc6ae89c8130532f6ad (diff) | |
| parent | f6cf87f748ff9480f97ff9c5caf6d6faacf52aa1 (diff) | |
| download | linux-d71b0ad8d30922ccdd0705318237e6890b4ec1b6.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to resolve a conflict
Conflicts:
tools/perf/ui/browsers/hists.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/ui')
| -rw-r--r-- | tools/perf/ui/browsers/hists.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 380e908..e1f28f4 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -2017,7 +2017,8 @@ skip_annotation: &options[nr_options], dso); nr_options += add_map_opt(browser, &actions[nr_options], &options[nr_options], - browser->selection->map); + browser->selection ? + browser->selection->map : NULL); nr_options += add_socket_opt(browser, &actions[nr_options], &options[nr_options], socked_id); @@ -2027,6 +2028,15 @@ skip_annotation: &actions[nr_options], &options[nr_options], thread, NULL); + /* + * Note that browser->selection != NULL + * when browser->he_selection is not NULL, + * so we don't need to check browser->selection + * before fetching browser->selection->sym like what + * we do before fetching browser->selection->map. + * + * See hist_browser__show_entry. + */ nr_options += add_script_opt(browser, &actions[nr_options], &options[nr_options], |