From 6fb4d90ebb82208736637c513241972dd1db6689 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 2 Jul 2009 17:58:19 +0200
Subject: [PATCH] --- yaml --- r: 155199 b: refs/heads/master c:
 14f4654cbd531d48651e005cf05907c14bddb193 h: refs/heads/master i:   155197:
 f4fd7db593f1079a10802189eca189f4f75af7fc   155195:
 699853a3d5eb6ac35b09a90f47669ef830032b69   155191:
 6fab2877412dd39de793e5b2790f64c7605bdb67   155183:
 65b2b53f9be4fd94f8711282ab26eb54690f736a   155167:
 46e0391b825709ad907ef3c4fbfd133ce6e69fd5   155135:
 6dd8406e32e64aa0c33084dcfd3b79c5a3925a24 v: v3

---
 [refs]                            | 2 +-
 trunk/tools/perf/util/callchain.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 629610398ceb..635cd962f50f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 429764873cf3fc3e73142872a674bb27cda589c1
+refs/heads/master: 14f4654cbd531d48651e005cf05907c14bddb193
diff --git a/trunk/tools/perf/util/callchain.c b/trunk/tools/perf/util/callchain.c
index 3dceabd9b5ef..3c4a91fea622 100644
--- a/trunk/tools/perf/util/callchain.c
+++ b/trunk/tools/perf/util/callchain.c
@@ -16,6 +16,9 @@
 
 #include "callchain.h"
 
+#define chain_for_each_child(child, parent)	\
+	list_for_each_entry(child, &parent->children, brothers)
+
 
 static void
 rb_insert_callchain(struct rb_root *root, struct callchain_node *chain)
@@ -46,7 +49,7 @@ void sort_chain_to_rbtree(struct rb_root *rb_root, struct callchain_node *node)
 {
 	struct callchain_node *child;
 
-	list_for_each_entry(child, &node->children, brothers)
+	chain_for_each_child(child, node)
 		sort_chain_to_rbtree(rb_root, child);
 
 	if (node->hit)
@@ -77,7 +80,7 @@ create_child(struct callchain_node *parent, bool inherit_children)
 		list_splice(&parent->children, &new->children);
 		INIT_LIST_HEAD(&parent->children);
 
-		list_for_each_entry(next, &new->children, brothers)
+		chain_for_each_child(next, new)
 			next->parent = new;
 	}
 	list_add_tail(&new->brothers, &parent->children);
@@ -173,7 +176,7 @@ __append_chain_children(struct callchain_node *root, struct ip_callchain *chain,
 	struct callchain_node *rnode;
 
 	/* lookup in childrens */
-	list_for_each_entry(rnode, &root->children, brothers) {
+	chain_for_each_child(rnode, root) {
 		unsigned int ret = __append_chain(rnode, chain, start, syms);
 
 		if (!ret)