diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 13:45:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 13:45:26 -0500 |
| commit | e20da891302c69d49fea181b4e49c33acc2305de (patch) | |
| tree | 237bb5e56a2a2ad84e796af6758079011896bf53 /kernel | |
| parent | 834db333eda46246f6290f0e1a7525af04fc8cb4 (diff) | |
| parent | 48d50674179981e41f432167b2441cec782d5484 (diff) | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/lockdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 5feaddcdbe49..c62ec14609b9 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
| @@ -2147,7 +2147,7 @@ check_usage_backwards(struct task_struct *curr, struct held_lock *this, | |||
| 2147 | return ret; | 2147 | return ret; |
| 2148 | 2148 | ||
| 2149 | return print_irq_inversion_bug(curr, &root, target_entry, | 2149 | return print_irq_inversion_bug(curr, &root, target_entry, |
| 2150 | this, 1, irqclass); | 2150 | this, 0, irqclass); |
| 2151 | } | 2151 | } |
| 2152 | 2152 | ||
| 2153 | void print_irqtrace_events(struct task_struct *curr) | 2153 | void print_irqtrace_events(struct task_struct *curr) |