diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-09-28 09:46:43 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-09-28 09:46:43 +0200 |
commit | 1d787d37c8ff6612b8151c6dff15bfa7347bcbdf (patch) | |
tree | f33947a6603b406ba1e8b80114b2de313bcd9f09 /tools/perf/util/hist.c | |
parent | ac2ba2b363a40a2431506d446985af4e4108b0d2 (diff) | |
parent | aec1930b0f6f281a0ca038cd03aceace3fe0bb61 (diff) |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* Improve listing of accessible enum perf probe variables, from Hyeoncheol Lee.
* Don't stop the build if the audit libraries are not installed, fix from Namhyung Kim.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/hist.c')
-rw-r--r-- | tools/perf/util/hist.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 6ec5398de89d..236bc9d98ff2 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -410,8 +410,13 @@ static bool hists__collapse_insert_entry(struct hists *hists __maybe_unused, cmp = hist_entry__collapse(iter, he); if (!cmp) { - iter->period += he->period; - iter->nr_events += he->nr_events; + iter->period += he->period; + iter->period_sys += he->period_sys; + iter->period_us += he->period_us; + iter->period_guest_sys += he->period_guest_sys; + iter->period_guest_us += he->period_guest_us; + iter->nr_events += he->nr_events; + if (symbol_conf.use_callchain) { callchain_cursor_reset(&callchain_cursor); callchain_merge(&callchain_cursor, |