diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-16 11:46:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 11:46:22 -0500 |
| commit | 5a2dd72abdae75ea2960145e0549635ce4e0be96 (patch) | |
| tree | 44dba0119c75679a17215200f92ab23bdde9efc2 /include/linux/debug_locks.h | |
| parent | efdc64f0c792ea744bcc9203f35b908e66d42f41 (diff) | |
| parent | 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 (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); | |||
| 17 | ({ \ | 17 | ({ \ |
| 18 | int __ret = 0; \ | 18 | int __ret = 0; \ |
| 19 | \ | 19 | \ |
| 20 | if (unlikely(c)) { \ | 20 | if (!oops_in_progress && unlikely(c)) { \ |
| 21 | if (debug_locks_off() && !debug_locks_silent) \ | 21 | if (debug_locks_off() && !debug_locks_silent) \ |
| 22 | WARN_ON(1); \ | 22 | WARN_ON(1); \ |
| 23 | __ret = 1; \ | 23 | __ret = 1; \ |