diff options
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 85e3ee1e474e..fd6e1b906b3c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -1101,7 +1101,6 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, | |||
1101 | 1101 | ||
1102 | entry->preempt_count = pc & 0xff; | 1102 | entry->preempt_count = pc & 0xff; |
1103 | entry->pid = (tsk) ? tsk->pid : 0; | 1103 | entry->pid = (tsk) ? tsk->pid : 0; |
1104 | entry->lock_depth = (tsk) ? tsk->lock_depth : 0; | ||
1105 | entry->flags = | 1104 | entry->flags = |
1106 | #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT | 1105 | #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT |
1107 | (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) | | 1106 | (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) | |
@@ -1748,10 +1747,9 @@ static void print_lat_help_header(struct seq_file *m) | |||
1748 | seq_puts(m, "# | / _----=> need-resched \n"); | 1747 | seq_puts(m, "# | / _----=> need-resched \n"); |
1749 | seq_puts(m, "# || / _---=> hardirq/softirq \n"); | 1748 | seq_puts(m, "# || / _---=> hardirq/softirq \n"); |
1750 | seq_puts(m, "# ||| / _--=> preempt-depth \n"); | 1749 | seq_puts(m, "# ||| / _--=> preempt-depth \n"); |
1751 | seq_puts(m, "# |||| /_--=> lock-depth \n"); | 1750 | seq_puts(m, "# |||| / delay \n"); |
1752 | seq_puts(m, "# |||||/ delay \n"); | 1751 | seq_puts(m, "# cmd pid ||||| time | caller \n"); |
1753 | seq_puts(m, "# cmd pid |||||| time | caller \n"); | 1752 | seq_puts(m, "# \\ / ||||| \\ | / \n"); |
1754 | seq_puts(m, "# \\ / |||||| \\ | / \n"); | ||
1755 | } | 1753 | } |
1756 | 1754 | ||
1757 | static void print_func_help_header(struct seq_file *m) | 1755 | static void print_func_help_header(struct seq_file *m) |