diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-16 17:46:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 17:46:22 +0100 |
| commit | 5a2dd72abdae75ea2960145e0549635ce4e0be96 (patch) | |
| tree | 44dba0119c75679a17215200f92ab23bdde9efc2 /include/linux/debug_locks.h | |
| parent | genirq: check chip->ack before calling (diff) | |
| parent | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
Merge branch 'linus' into irq/genirq
Diffstat (limited to 'include/linux/debug_locks.h')
| -rw-r--r-- | include/linux/debug_locks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h index 4aaa4afb1cb9..096476f1fb35 100644 --- a/include/linux/debug_locks.h +++ b/include/linux/debug_locks.h @@ -17,7 +17,7 @@ extern int debug_locks_off(void); ({ \ int __ret = 0; \ \ - if (unlikely(c)) { \ + if (!oops_in_progress && unlikely(c)) { \ if (debug_locks_off() && !debug_locks_silent) \ WARN_ON(1); \ __ret = 1; \ |