tracing: fix transposed numbers of lock_depth and preempt_count
Steven Rostedt
maintainerIngo,
Please pull the latest tip/tracing/urgent tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/urgent
Steven Rostedt (1):
tracing: fix transposed numbers of lock_depth and preempt_count
----
kernel/trace/trace_output.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) --------------------------- commit c204d97eab2c888b2bc37d594dff8b48782d6af5 Author: Steven Rostedt <[email protected]> Date: Sun Sep 27 07:02:07 2009 -0400
tracing: fix transposed numbers of lock_depth and preempt_count
The lock_depth and preempt_count numbers in the latency format is transposed.
Signed-off-by Steven Rostedt <[email protected]>
kernel/trace/trace_output.c +8 -6
@@ -486,16 +486,18 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) hardirq ? 'h' : softirq ? 's' : '.'))return 0 ; -if (entry->lock_depth <0 ) - ret =trace_seq_putc (s,'.' ); +if (entry->preempt_count) + ret =trace_seq_printf (s,"%x" , entry->preempt_count);else - ret =trace_seq_printf (s,"%d" , entry->lock_depth); + ret =trace_seq_putc (s,'.' ); +if (!ret)return 0 ; -if (entry->preempt_count) -return trace_seq_printf (s,"%x" , entry->preempt_count); -return trace_seq_putc (s,'.' ); +if (entry->lock_depth <0 ) +return trace_seq_putc (s,'.' ); + +return trace_seq_printf (s,"%d" , entry->lock_depth); } static int