perf callchain: Don't give arbitrary gender to callchain tree nodes

Some little callchain tree nodes shyly asked me if they can have
sisters.

How cute!

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1294977121-5700-5-git-send-email-fweisbec@gmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 5b3f09dd137dc91007837a005a3769ac4674115b..f8c66d1435e09373f2a78ffe5c0d27a45d39a2ce 100644 (file)
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -26,10 +26,10 @@ bool ip_callchain__valid(struct ip_callchain *chain, const event_t *event)
 }
 
 #define chain_for_each_child(child, parent)    \
-       list_for_each_entry(child, &parent->children, brothers)
+       list_for_each_entry(child, &parent->children, siblings)
 
 #define chain_for_each_child_safe(child, next, parent) \
-       list_for_each_entry_safe(child, next, &parent->children, brothers)
+       list_for_each_entry_safe(child, next, &parent->children, siblings)
 
 static void
 rb_insert_callchain(struct rb_root *root, struct callchain_node *chain,
@@ -189,7 +189,7 @@ create_child(struct callchain_node *parent, bool inherit_children)
                chain_for_each_child(next, new)
                        next->parent = new;
        }
-       list_add_tail(&new->brothers, &parent->children);
+       list_add_tail(&new->siblings, &parent->children);
 
        return new;
 }
@@ -419,7 +419,7 @@ merge_chain_branch(struct callchain_cursor *cursor,
                if (err)
                        break;
 
-               list_del(&child->brothers);
+               list_del(&child->siblings);
                free(child);
        }
 

diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 2bb5403010d2b734ab0a45fc2a850a3ae4d3ce6d..67137256a1cdfd757a1aa8747f759a89850b6010 100644 (file)
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -16,7 +16,7 @@ enum chain_mode {
 
 struct callchain_node {
        struct callchain_node   *parent;
-       struct list_head        brothers;
+       struct list_head        siblings;
        struct list_head        children;
        struct list_head        val;
        struct rb_node          rb_node; /* to sort nodes in an rbtree */
@@ -72,7 +72,7 @@ struct callchain_cursor {
 
 static inline void callchain_init(struct callchain_root *root)
 {
-       INIT_LIST_HEAD(&root->node.brothers);
+       INIT_LIST_HEAD(&root->node.siblings);
        INIT_LIST_HEAD(&root->node.children);
        INIT_LIST_HEAD(&root->node.val);