The following commit has been merged in the linux branch: commit a813a159766ee9d36aa1fc717c60d63325a6d077 Author: Steven Rostedt srostedt@redhat.com Date: Fri Oct 9 01:41:35 2009 -0400

tracing: fix trace_vprintk call

The addition of trace_array_{v}printk used the wrong function for trace_vprintk to call. This broke trace_marker and trace_vprintk itself. Although trace_printk may not have been affected by those that end up calling trace_vbprintk.

Signed-off-by: Steven Rostedt rostedt@goodmis.org

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 4506826..c820b03 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1393,7 +1393,7 @@ int trace_array_vprintk(struct trace_array *tr,

int trace_vprintk(unsigned long ip, const char *fmt, va_list args) { - return trace_array_printk(&global_trace, ip, fmt, args); + return trace_array_vprintk(&global_trace, ip, fmt, args); } EXPORT_SYMBOL_GPL(trace_vprintk);