Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 269050
b: refs/heads/master
c: e39622c
h: refs/heads/master
v: v3
  • Loading branch information
Stephane Eranian authored and Arnaldo Carvalho de Melo committed Oct 7, 2011
1 parent 827daab commit 188f400
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8b1bfdbdb3041c0503c42ef49bab25caabeaa558
refs/heads/master: e39622ceb169467dbe3d11491745aa1f7f3a92ad
1 change: 1 addition & 0 deletions trunk/tools/perf/util/hist.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 188f400

Please sign in to comment.