From: Ingo Molnar Date: Wed, 16 Sep 2015 07:19:56 +0000 (+0200) Subject: Merge branch 'perf/urgent' into perf/core, to resolve a conflict X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d71b0ad8d30922ccdd0705318237e6890b4ec1b6;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'perf/urgent' into perf/core, to resolve a conflict Conflicts: tools/perf/ui/browsers/hists.c Signed-off-by: Ingo Molnar --- d71b0ad8d30922ccdd0705318237e6890b4ec1b6 diff --cc tools/perf/ui/browsers/hists.c index 380e9080991e,c04c60d4863c..e1f28f4cdc8e --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@@ -2017,10 -1968,9 +2017,11 @@@ 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); /* perf script support */ if (browser->he_selection) { nr_options += add_script_opt(browser,