aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/trace-event-parse.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-07-18 11:17:17 +0200
committerIngo Molnar <mingo@kernel.org>2012-07-18 11:17:17 +0200
commita2fe194723f6e4990d01d8c208c7b138fd410522 (patch)
tree7aee93fa8f4ba1e18b56fa7d8eab75d249fc6966 /tools/perf/util/trace-event-parse.c
parentperf/x86: Fix intel_perfmon_event_mapformatting (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-dev-a2fe194723f6e4990d01d8c208c7b138fd410522.tar.xz
linux-dev-a2fe194723f6e4990d01d8c208c7b138fd410522.zip
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>
Diffstat (limited to 'tools/perf/util/trace-event-parse.c')
-rw-r--r--tools/perf/util/trace-event-parse.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index a51bd86f4d09..0715c843c2e7 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -188,9 +188,8 @@ void print_trace_event(struct pevent *pevent, int cpu, void *data, int size)
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(struct pevent *pevent, int cpu, void *data, int size,