Merge branch 'perf/urgent' into perf/core

Conflicts: tools/perf/util/callchain.h Merge reason: Fix a non-trivial conflict with latest fixes
2010-08-27 02:28:40 +02:00
parent 7de5d895b2 5225c45899
commit 98ee74a75c
3 changed files with 4 additions and 1 deletions
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -57,6 +57,7 @@ static inline void callchain_init(struct callchain_root *root)

 	root->node.parent = NULL;
 	root->node.hit = 0;
+	root->node.children_hit = 0;
 	root->max_depth = 0;
 }