diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-26 20:28:40 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-26 20:30:07 -0400 |
| commit | 98ee74a75ca0f047e75400afa712f7bf08268b8e (patch) | |
| tree | c87b267f1e279173696f2294b3930940f1a5b570 /tools | |
| parent | 7de5d895b2020260190db0021de646f3f22f755e (diff) | |
| parent | 5225c45899e872383ca39f5533d28ec63c54b39e (diff) | |
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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h index 51a8f2b600bd..c15fb8c24ad2 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) | |||
| 57 | 57 | ||
| 58 | root->node.parent = NULL; | 58 | root->node.parent = NULL; |
| 59 | root->node.hit = 0; | 59 | root->node.hit = 0; |
| 60 | root->node.children_hit = 0; | ||
| 60 | root->max_depth = 0; | 61 | root->max_depth = 0; |
| 61 | } | 62 | } |
| 62 | 63 | ||