diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-24 05:09:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-24 05:09:08 +0100 |
| commit | 69e6cdd0cf16f645be39038e5ccc9379e3923d00 (patch) | |
| tree | 3edb32b07ef37be1536f6510ec8e7caaf5acbbb8 /tools/perf/util/hist.c | |
| parent | Merge tag 'perf-core-for-mingo-20161114' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | Merge tag 'nfs-for-4.9-4' of git://git.linux-nfs.org/projects/anna/linux-nfs (diff) | |
| download | linux-69e6cdd0cf16f645be39038e5ccc9379e3923d00.tar.xz linux-69e6cdd0cf16f645be39038e5ccc9379e3923d00.zip | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/hist.c')
| -rw-r--r-- | tools/perf/util/hist.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index e1be4132054d..6770a9645609 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -1601,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; } |