Merge branch 'linus' into perf/core
Ingo Molnar [Wed, 21 Jul 2010 19:43:03 +0000 (21:43 +0200)]
Merge reason: Pick up the latest perf fixes.

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

1  2 
MAINTAINERS
Makefile
arch/powerpc/kernel/perf_event.c
arch/sparc/kernel/perf_event.c
arch/x86/kernel/kprobes.c
include/linux/syscalls.h
tools/perf/builtin-report.c
tools/perf/util/callchain.c
tools/perf/util/callchain.h

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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 */