Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fix from Arnaldo Carvalho de Melo: - Fix 'perf report' and 'perf top' handling of the '--dsos DSO-LIST', '--comms COMM-LIST' and '--symbols SYM-LIST' command line options, that were segfaulting due to not considering those lists as filters in the hists browser TUI code. (Arnaldo Carvalho de Melo) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -48,7 +48,7 @@ static struct rb_node *hists__filter_entries(struct rb_node *nd,
|
||||
|
||||
static bool hist_browser__has_filter(struct hist_browser *hb)
|
||||
{
|
||||
return hists__has_filter(hb->hists) || hb->min_pcnt;
|
||||
return hists__has_filter(hb->hists) || hb->min_pcnt || symbol_conf.has_filter;
|
||||
}
|
||||
|
||||
static int hist_browser__get_folding(struct hist_browser *browser)
|
||||
|
@@ -1911,6 +1911,8 @@ int setup_list(struct strlist **list, const char *list_str,
|
||||
pr_err("problems parsing %s list\n", list_name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
symbol_conf.has_filter = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@@ -105,7 +105,8 @@ struct symbol_conf {
|
||||
demangle_kernel,
|
||||
filter_relative,
|
||||
show_hist_headers,
|
||||
branch_callstack;
|
||||
branch_callstack,
|
||||
has_filter;
|
||||
const char *vmlinux_name,
|
||||
*kallsyms_name,
|
||||
*source_prefix,
|
||||
|
Reference in New Issue
Block a user