aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2010-08-27 02:28:40 +0200
committerFrederic Weisbecker <fweisbec@gmail.com>2010-08-27 02:30:07 +0200
commit98ee74a75ca0f047e75400afa712f7bf08268b8e (patch)
treec87b267f1e279173696f2294b3930940f1a5b570 /tools
parent7de5d895b2020260190db0021de646f3f22f755e (diff)
parent5225c45899e872383ca39f5533d28ec63c54b39e (diff)
downloadmrst-s0i3-test-98ee74a75ca0f047e75400afa712f7bf08268b8e.tar.gz
mrst-s0i3-test-98ee74a75ca0f047e75400afa712f7bf08268b8e.tar.xz
mrst-s0i3-test-98ee74a75ca0f047e75400afa712f7bf08268b8e.zip
Merge branch 'perf/urgent' into perf/core
Conflicts: tools/perf/util/callchain.h Merge reason: Fix a non-trivial conflict with latest fixes
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/callchain.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 51a8f2b600b..c15fb8c24ad 100644
--- 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;
}