diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2009-09-27 07:02:07 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2009-10-07 14:05:04 -0400 |
| commit | 829b876dfc94ea8be3a47e200d06f1f217bb104f (patch) | |
| tree | 615753acc06c1ba078da4033c4ce59a7091e0820 /kernel | |
| parent | b0f56f1a63b7b968e6feeeefeace24bc8e0a4a65 (diff) | |
| download | linux-stable-829b876dfc94ea8be3a47e200d06f1f217bb104f.tar.gz linux-stable-829b876dfc94ea8be3a47e200d06f1f217bb104f.tar.bz2 linux-stable-829b876dfc94ea8be3a47e200d06f1f217bb104f.zip | |
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 <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_output.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index cda766f9f421..ed17565826b0 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -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 |