diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-06-05 16:50:29 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-05 16:50:29 +0200 |
commit | 918143e8b7d6153d7a83a3f854323407939f4a7e (patch) | |
tree | 34c0b1434516d146fc3811a6d071b052dd59342b /include/trace | |
parent | 64edbc562034f2ec3fce382cb208fab40586d005 (diff) | |
parent | 563af16c30ede41eda2d614195d88e07f7c7103d (diff) | |
download | linux-3.10-918143e8b7d6153d7a83a3f854323407939f4a7e.tar.gz linux-3.10-918143e8b7d6153d7a83a3f854323407939f4a7e.tar.bz2 linux-3.10-918143e8b7d6153d7a83a3f854323407939f4a7e.zip |
Merge branch 'tip/tracing/ftrace-4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/ftrace.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index b5478dab579..40ede4db4d8 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) \ |