diff options
| author | Jonathan Corbet | 2016-12-27 20:53:44 +0100 |
|---|---|---|
| committer | Jonathan Corbet | 2016-12-27 20:53:44 +0100 |
| commit | 54ab6db0909061ab7ee07233d3cab86d29f86e6c (patch) | |
| tree | a7650ab5c0fa3a6a3841de8e8693041b3e009054 /tools/perf/util/hist.c | |
| parent | docs: sphinx-extensions: make rstFlatTable work with docutils 0.13 (diff) | |
| parent | Linux 4.10-rc1 (diff) | |
| download | kernel-qcow2-linux-54ab6db0909061ab7ee07233d3cab86d29f86e6c.tar.gz kernel-qcow2-linux-54ab6db0909061ab7ee07233d3cab86d29f86e6c.tar.xz kernel-qcow2-linux-54ab6db0909061ab7ee07233d3cab86d29f86e6c.zip | |
Merge tag 'v4.10-rc1' into docs-next
Linux 4.10-rc1
Diffstat (limited to 'tools/perf/util/hist.c')
| -rw-r--r-- | tools/perf/util/hist.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index b02992efb513..6770a9645609 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -1195,6 +1195,7 @@ static void hist_entry__check_and_remove_filter(struct hist_entry *he, case HIST_FILTER__GUEST: case HIST_FILTER__HOST: case HIST_FILTER__SOCKET: + case HIST_FILTER__C2C: default: return; } @@ -1600,18 +1601,18 @@ static void hists__hierarchy_output_resort(struct hists *hists, if (prog) ui_progress__update(prog, 1); + hists->nr_entries++; + if (!he->filtered) { + hists->nr_non_filtered_entries++; + hists__calc_col_len(hists, he); + } + if (!he->leaf) { hists__hierarchy_output_resort(hists, prog, &he->hroot_in, &he->hroot_out, min_callchain_hits, use_callchain); - hists->nr_entries++; - if (!he->filtered) { - hists->nr_non_filtered_entries++; - hists__calc_col_len(hists, he); - } - continue; } |