Merge branch 'tip/tracing/ftrace-4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

1 files changed, 2 insertions, 0 deletions

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index b5478dab579b..40ede4db4d88 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -104,6 +104,7 @@
  *      field = (typeof(field))entry;
  *
  *      p = get_cpu_var(ftrace_event_seq);
+ *      trace_seq_init(p);
  *      ret = trace_seq_printf(s, <TP_printk> "\n");
  *      put_cpu();
  *      if (!ret)
@@ -167,6 +168,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags)	\
         field = (typeof(field))entry;                                   \
                                                                         \
         p = &get_cpu_var(ftrace_event_seq);                             \
+        trace_seq_init(p);                                              \
         ret = trace_seq_printf(s, #call ": " print);                    \
         put_cpu();                                                      \
         if (!ret)                                                       \