diff options
Diffstat (limited to 'kernel/trace/trace_output.c')
| -rw-r--r-- | kernel/trace/trace_output.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index be34a6aa7e4d..29a370a45582 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c | |||
| @@ -465,6 +465,7 @@ lat_print_generic(struct trace_seq *s, struct trace_entry *entry, int cpu) | |||
| 465 | { | 465 | { |
| 466 | int hardirq, softirq; | 466 | int hardirq, softirq; |
| 467 | char comm[TASK_COMM_LEN]; | 467 | char comm[TASK_COMM_LEN]; |
| 468 | int ret; | ||
| 468 | 469 | ||
| 469 | trace_find_cmdline(entry->pid, comm); | 470 | trace_find_cmdline(entry->pid, comm); |
| 470 | hardirq = entry->flags & TRACE_FLAG_HARDIRQ; | 471 | hardirq = entry->flags & TRACE_FLAG_HARDIRQ; |
| @@ -481,9 +482,16 @@ lat_print_generic(struct trace_seq *s, struct trace_entry *entry, int cpu) | |||
| 481 | hardirq ? 'h' : softirq ? 's' : '.')) | 482 | hardirq ? 'h' : softirq ? 's' : '.')) |
| 482 | return 0; | 483 | return 0; |
| 483 | 484 | ||
| 485 | if (entry->lock_depth < 0) | ||
| 486 | ret = trace_seq_putc(s, '.'); | ||
| 487 | else | ||
| 488 | ret = trace_seq_printf(s, "%d", entry->lock_depth); | ||
| 489 | if (!ret) | ||
| 490 | return 0; | ||
| 491 | |||
| 484 | if (entry->preempt_count) | 492 | if (entry->preempt_count) |
| 485 | return trace_seq_printf(s, "%x", entry->preempt_count); | 493 | return trace_seq_printf(s, "%x", entry->preempt_count); |
| 486 | return trace_seq_puts(s, "."); | 494 | return trace_seq_putc(s, '.'); |
| 487 | } | 495 | } |
| 488 | 496 | ||
| 489 | static unsigned long preempt_mark_thresh = 100; | 497 | static unsigned long preempt_mark_thresh = 100; |
