Commit 26575e28 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar

lockdep: remove extra "irq" string

Impact: clarify lockdep printk text

print_irq_inversion_bug() gets handed state strings of the form

  "HARDIRQ", "SOFTIRQ", "RECLAIM_FS"

and appends "-irq-{un,}safe" to them, which is either redudant for *IRQ or
confusing in the RECLAIM_FS case.
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1236175192.5330.7585.camel@laptop>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1c21f14e
...@@ -1900,9 +1900,9 @@ print_irq_inversion_bug(struct task_struct *curr, struct lock_class *other, ...@@ -1900,9 +1900,9 @@ print_irq_inversion_bug(struct task_struct *curr, struct lock_class *other,
curr->comm, task_pid_nr(curr)); curr->comm, task_pid_nr(curr));
print_lock(this); print_lock(this);
if (forwards) if (forwards)
printk("but this lock took another, %s-irq-unsafe lock in the past:\n", irqclass); printk("but this lock took another, %s-unsafe lock in the past:\n", irqclass);
else else
printk("but this lock was taken by another, %s-irq-safe lock in the past:\n", irqclass); printk("but this lock was taken by another, %s-safe lock in the past:\n", irqclass);
print_lock_name(other); print_lock_name(other);
printk("\n\nand interrupts could create inverse lock ordering between them.\n\n"); printk("\n\nand interrupts could create inverse lock ordering between them.\n\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment