From 94d24fe4c5a382efcba3515cacb8946a10b4dd1b Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 4 Mar 2009 14:53:24 +0100 Subject: [PATCH] --- yaml --- r: 140418 b: refs/heads/master c: 26575e28df5eb2050c02369843faba38cecb4d8c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/lockdep.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b633c000f488..67d440eb2d35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c21f14ec48a2256fb03682b24dddd23eacdc96f +refs/heads/master: 26575e28df5eb2050c02369843faba38cecb4d8c diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index ef6584fd9fe5..02014f7ccc86 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/kernel/lockdep.c @@ -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");