Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/util/callchain.h

Merge reason:
	Fix a non-trivial conflict with latest fixes

diff --combined tools/perf/util/callchain.h
index 51a8f2b600bd75dfb0296b1cc943d3778fa2fc9f,6de4313924fb5c510f354cb3a8e2a73061e103f6..c15fb8c24ad2b87388e97cd6346cfdebaac11dd5
--- 1/tools/perf/util/callchain.h
--- 2/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@@ -26,14 -26,9 +26,14 @@@ struct callchain_node 
        u64                     children_hit;
  };
  
 +struct callchain_root {
 +      u64                     max_depth;
 +      struct callchain_node   node;
 +};
 +
  struct callchain_param;
  
 -typedef void (*sort_chain_func_t)(struct rb_root *, struct callchain_node *,
 +typedef void (*sort_chain_func_t)(struct rb_root *, struct callchain_root *,
                                 u64, struct callchain_param *);
  
  struct callchain_param {
@@@ -49,15 -44,15 +49,16 @@@ struct callchain_list 
        struct list_head        list;
  };
  
 -static inline void callchain_init(struct callchain_node *node)
 +static inline void callchain_init(struct callchain_root *root)
  {
 -      INIT_LIST_HEAD(&node->brothers);
 -      INIT_LIST_HEAD(&node->children);
 -      INIT_LIST_HEAD(&node->val);
 +      INIT_LIST_HEAD(&root->node.brothers);
 +      INIT_LIST_HEAD(&root->node.children);
 +      INIT_LIST_HEAD(&root->node.val);
  
 -      node->children_hit = 0;
 -      node->parent = NULL;
 -      node->hit = 0;
 +      root->node.parent = NULL;
 +      root->node.hit = 0;
++      root->node.children_hit = 0;
 +      root->max_depth = 0;
  }
  
  static inline u64 cumul_hits(struct callchain_node *node)
@@@ -66,9 -61,8 +67,9 @@@
  }
  
  int register_callchain_param(struct callchain_param *param);
 -int append_chain(struct callchain_node *root, struct ip_callchain *chain,
 -               struct map_symbol *syms, u64 period);
 +int callchain_append(struct callchain_root *root, struct ip_callchain *chain,
 +                   struct map_symbol *syms, u64 period);
 +int callchain_merge(struct callchain_root *dst, struct callchain_root *src);
  
  bool ip_callchain__valid(struct ip_callchain *chain, const event_t *event);
  #endif        /* __PERF_CALLCHAIN_H */