xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'perf/urgent' into perf/core, to resolve a conflict

Browse Source 
Conflicts:
	tools/perf/ui/browsers/hists.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2015-09-16 09:19:56 +02:00
parent a4d71093e7 f6cf87f748
commit d71b0ad8d3
9 changed files with 126 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/perf/ui/browsers/hists.c
View File

@@ -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],