Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / kernel / trace / trace_output.c

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index ca0e79e2abaa6a76fc4d9b83035bb7e829cb1402..a436de18aa999d78e4ee3be58d04c7ddbdffff5f 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -431,7 +431,7 @@ int ftrace_raw_output_prep(struct trace_iterator *iter,
        }
 
        trace_seq_init(p);
-       ret = trace_seq_printf(s, "%s: ", event->name);
+       ret = trace_seq_printf(s, "%s: ", ftrace_event_name(event));
        if (!ret)
                return TRACE_TYPE_PARTIAL_LINE;