From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 18 Jul 2012 09:17:17 +0000 (+0200)
Subject: Merge branch 'linus' into perf/core
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a2fe194723f6e4990d01d8c208c7b138fd410522;p=~shefty%2Frdma-dev.git

Merge branch 'linus' into perf/core

Pick up the latest ring-buffer fixes, before applying a new fix.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

a2fe194723f6e4990d01d8c208c7b138fd410522
diff --cc tools/perf/util/trace-event-parse.c
index a51bd86f4d0,5dd3b5ec841..0715c843c2e
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@@ -188,13 -198,12 +188,12 @@@ void print_trace_event(struct pevent *p
  	record.data = data;
  
  	trace_seq_init(&s);
- 	pevent_print_event(pevent, &s, &record);
+ 	pevent_event_info(&s, event, &record);
  	trace_seq_do_printf(&s);
- 	printf("\n");
  }
  
 -void print_event(int cpu, void *data, int size, unsigned long long nsecs,
 -		  char *comm)
 +void print_event(struct pevent *pevent, int cpu, void *data, int size,
 +		 unsigned long long nsecs, char *comm)
  {
  	struct pevent_record record;
  	struct trace_seq s;