Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/util/callchain.h

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

diff --cc tools/perf/util/callchain.h
index 51a8f2b,6de4313..c15fb8c
--- 1/tools/perf/util/callchain.h
--- 2/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@@ -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)