From 188f400aa3d14f370be7822e8810418ab928f40b Mon Sep 17 00:00:00 2001 From: Stephane Eranian Date: Mon, 3 Oct 2011 11:38:15 +0200 Subject: [PATCH] --- yaml --- r: 269050 b: refs/heads/master c: e39622ceb169467dbe3d11491745aa1f7f3a92ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/perf/util/hist.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3b294318e491..c1306cbba79e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b1bfdbdb3041c0503c42ef49bab25caabeaa558 +refs/heads/master: e39622ceb169467dbe3d11491745aa1f7f3a92ad diff --git a/trunk/tools/perf/util/hist.c b/trunk/tools/perf/util/hist.c index 87ef5c7797de..50c8fece1681 100644 --- a/trunk/tools/perf/util/hist.c +++ b/trunk/tools/perf/util/hist.c @@ -281,6 +281,7 @@ static bool hists__collapse_insert_entry(struct hists *hists, if (!cmp) { iter->period += he->period; + iter->nr_events += he->nr_events; if (symbol_conf.use_callchain) { callchain_cursor_reset(&hists->callchain_cursor); callchain_merge(&hists->callchain_cursor, iter->callchain,