Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

kernel/lockdep.c

+2 −2
Original line number Diff line number Diff line
@@ -1900,9 +1900,9 @@ print_irq_inversion_bug(struct task_struct *curr, struct lock_class *other, 
		curr->comm, task_pid_nr(curr));

	print_lock(this);

	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

		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);

	printk("\n\nand interrupts could create inverse lock ordering between them.\n\n");