From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Fri, 27 Aug 2010 00:28:40 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=98ee74a75ca0f047e75400afa712f7bf08268b8e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/util/callchain.h

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

98ee74a75ca0f047e75400afa712f7bf08268b8e
diff --cc tools/perf/util/callchain.h
index 51a8f2b600bd,6de4313924fb..c15fb8c24ad2
--- a/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)