From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 21 Jul 2010 19:43:03 +0000 (+0200)
Subject: Merge branch 'linus' into perf/core
X-Git-Tag: v2.6.36-rc1~532^2~30
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=9dcdbf7a33d9018ac5d45debcf261be648bdd56a;p=net-next-2.6.git

Merge branch 'linus' into perf/core

Merge reason: Pick up the latest perf fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

9dcdbf7a33d9018ac5d45debcf261be648bdd56a
diff --cc tools/perf/util/callchain.h
index 809850fb75f,f2e9ee164bd..624a96c636f
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@@ -58,7 -61,7 +61,7 @@@ static inline u64 cumul_hits(struct cal
  
  int register_callchain_param(struct callchain_param *param);
  int append_chain(struct callchain_node *root, struct ip_callchain *chain,
- 		 struct map_symbol *syms);
+ 		 struct map_symbol *syms, u64 period);
  
 -bool ip_callchain__valid(struct ip_callchain *chain, event_t *event);
 +bool ip_callchain__valid(struct ip_callchain *chain, const event_t *event);
  #endif	/* __PERF_CALLCHAIN_H */