Commit e20da891 authored Feb 01, 2010 by Linus Torvalds

Merge branch 'core-fixes-for-linus' of...

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: Fix check_usage_backwards() error message

parents 834db333 48d50674

kernel/lockdep.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2147,7 +2147,7 @@ check_usage_backwards(struct task_struct curr, struct held_lock this,
		return ret;

		return print_irq_inversion_bug(curr, &root, target_entry,
		this, 1, irqclass);
		this, 0, irqclass);
		}

		void print_irqtrace_events(struct task_struct *curr)