History

tracing: fix transposed numbers of lock_depth and preempt_count

The lock_depth and preempt_count numbers in the latency format is transposed.

Steven Rostedt committed 17 years ago

Commit 829b8761 parent b0f56f11 file · +8 −6Browse files

Unified · Split

kernel/trace/trace_output.c+8−6
@@ -486,16 +486,18 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) · 485 unmodified lines
486486 hardirq ? 'h' : softirq ? 's' : '.'))
487487 return 0;
488488
489− if (entry->lock_depth < 0)
490− ret = trace_seq_putc(s, '.');
489+ if (entry->preempt_count)
490+ ret = trace_seq_printf(s, "%x", entry->preempt_count);
491491 else
492− ret = trace_seq_printf(s, "%d", entry->lock_depth);
492+ ret = trace_seq_putc(s, '.');
493+
493494 if (!ret)
494495 return 0;
495496
496− if (entry->preempt_count)
497− return trace_seq_printf(s, "%x", entry->preempt_count);
498− return trace_seq_putc(s, '.');
497+ if (entry->lock_depth < 0)
498+ return trace_seq_putc(s, '.');
499+
500+ return trace_seq_printf(s, "%d", entry->lock_depth);
499501 }
500502
501503 static int