diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
| commit | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (patch) | |
| tree | 03de82e812f00957aa6276dac2fe51c3358e88d7 /include/linux/debug_locks.h | |
| parent | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts:
include/linux/kernel_stat.h
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; \ |