Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core

2010-05-03 08:29:35 +02:00
parent 090f7204df feef47d0cb
commit 0806ebd974
28 changed files with 243 additions and 256 deletions
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@ -244,7 +244,6 @@ extern int header_page_data_size;

 extern bool latency_format;

-int parse_header_page(char *buf, unsigned long size);
 int trace_parse_common_type(void *data);
 int trace_parse_common_pid(void *data);
 int parse_common_pc(void *data);