Skip to contentSkip to conversation

lockdep: remove extra "irq" string

PATCH In review Peter Zijlstra 2 participants 2 messages Mar 4, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lockdep: remove extra "irq" string

Subject: lockdep: remove extra "irq" string
From: Peter Zijlstra <[email protected]>
Date: Wed Mar 04 14:53:24 CET 2009

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.

---
 kernel/lockdep.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/lockdep.c +2 -2
Index: linux-2.6/kernel/lockdep.c
===================================================================
@@ -1901,9 +1901,9 @@ print_irq_inversion_bug(struct task_stru
 		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");
 
#1 lore raw
Commit-ID:  26575e28df5eb2050c02369843faba38cecb4d8c
Gitweb:     http://git.kernel.org/tip/26575e28df5eb2050c02369843faba38cecb4d8c
Author:     "Peter Zijlstra" <[email protected]>
AuthorDate: Wed, 4 Mar 2009 14:53:24 +0100
Commit:     Ingo Molnar <[email protected]>
CommitDate: Wed, 4 Mar 2009 18:38:34 +0100

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.

LKML-Reference: <1236175192.5330.7585.camel@laptop>

---
 kernel/lockdep.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/lockdep.c +2 -2
index ef6584f..02014f7 100644
@@ -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");