Merge branch 'linus' into x86/urgent

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / tools / perf / util / callchain.c

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 53a49e0cfc6c64bf4b162ea89462265e143bc599..9f7106a8d9a48cb6f9600beac10bfa3a38bd9be5 100644 (file)
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -18,7 +18,8 @@
 #include "util.h"
 #include "callchain.h"
 
-bool ip_callchain__valid(struct ip_callchain *chain, const event_t *event)
+bool ip_callchain__valid(struct ip_callchain *chain,
+                        const union perf_event *event)
 {
        unsigned int chain_size = event->header.size;
        chain_size -= (unsigned long)&event->ip.__more_data - (unsigned long)event;
@@ -26,10 +27,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,
@@ -38,14 +39,14 @@ rb_insert_callchain(struct rb_root *root, struct callchain_node *chain,
        struct rb_node **p = &root->rb_node;
        struct rb_node *parent = NULL;
        struct callchain_node *rnode;
-       u64 chain_cumul = cumul_hits(chain);
+       u64 chain_cumul = callchain_cumul_hits(chain);
 
        while (*p) {
                u64 rnode_cumul;
 
                parent = *p;
                rnode = rb_entry(parent, struct callchain_node, rb_node);
-               rnode_cumul = cumul_hits(rnode);
+               rnode_cumul = callchain_cumul_hits(rnode);
 
                switch (mode) {
                case CHAIN_FLAT:
@@ -104,7 +105,7 @@ static void __sort_chain_graph_abs(struct callchain_node *node,
 
        chain_for_each_child(child, node) {
                __sort_chain_graph_abs(child, min_hit);
-               if (cumul_hits(child) >= min_hit)
+               if (callchain_cumul_hits(child) >= min_hit)
                        rb_insert_callchain(&node->rb_root, child,
                                            CHAIN_GRAPH_ABS);
        }
@@ -129,7 +130,7 @@ static void __sort_chain_graph_rel(struct callchain_node *node,
 
        chain_for_each_child(child, node) {
                __sort_chain_graph_rel(child, min_percent);
-               if (cumul_hits(child) >= min_hit)
+               if (callchain_cumul_hits(child) >= min_hit)
                        rb_insert_callchain(&node->rb_root, child,
                                            CHAIN_GRAPH_REL);
        }
@@ -143,7 +144,7 @@ sort_chain_graph_rel(struct rb_root *rb_root, struct callchain_root *chain_root,
        rb_root->rb_node = chain_root->node.rb_root.rb_node;
 }
 
-int register_callchain_param(struct callchain_param *param)
+int callchain_register_param(struct callchain_param *param)
 {
        switch (param->mode) {
        case CHAIN_GRAPH_ABS:
@@ -189,7 +190,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;
 }
@@ -270,7 +271,7 @@ split_add_child(struct callchain_node *parent,
        /* split the hits */
        new->hit = parent->hit;
        new->children_hit = parent->children_hit;
-       parent->children_hit = cumul_hits(new);
+       parent->children_hit = callchain_cumul_hits(new);
        new->val_nr = parent->val_nr - idx_local;
        parent->val_nr = idx_local;
 
@@ -419,7 +420,7 @@ merge_chain_branch(struct callchain_cursor *cursor,
                if (err)
                        break;
 
-               list_del(&child->brothers);
+               list_del(&child->siblings);
                free(child);
        }