Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

1 files changed, 6 insertions, 5 deletions

diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 4f7f989..9e99060 100644
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -21,11 +21,11 @@ enum chain_order {
 
 struct callchain_node {
 	struct callchain_node	*parent;
+	struct list_head	siblings;
+	struct list_head	children;
 	struct list_head	val;
-	struct rb_node		rb_node_in; /* to insert nodes in an rbtree */
-	struct rb_node		rb_node;    /* to sort nodes in an output tree */
-	struct rb_root		rb_root_in; /* input tree of children */
-	struct rb_root		rb_root;    /* sorted output tree of children */
+	struct rb_node		rb_node; /* to sort nodes in an rbtree */
+	struct rb_root		rb_root; /* sorted tree of children */
 	unsigned int		val_nr;
 	u64			hit;
 	u64			children_hit;
@@ -86,12 +86,13 @@ extern __thread struct callchain_cursor callchain_cursor;
 
 static inline void callchain_init(struct callchain_root *root)
 {
+	INIT_LIST_HEAD(&root->node.siblings);
+	INIT_LIST_HEAD(&root->node.children);
 	INIT_LIST_HEAD(&root->node.val);
 
 	root->node.parent = NULL;
 	root->node.hit = 0;
 	root->node.children_hit = 0;
-	root->node.rb_root_in = RB_ROOT;
 	root->max_depth = 0;
 }