diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /include/linux/debug_locks.h | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 952bee79a8..1678a5de70 100644 --- a/include/linux/debug_locks.h +++ b/include/linux/debug_locks.h | |||
| @@ -24,7 +24,7 @@ extern int debug_locks_off(void); | |||
| 24 | int __ret = 0; \ | 24 | int __ret = 0; \ |
| 25 | \ | 25 | \ |
| 26 | if (unlikely(c)) { \ | 26 | if (unlikely(c)) { \ |
| 27 | if (debug_locks_off()) \ | 27 | if (debug_locks_off() && !debug_locks_silent) \ |
| 28 | WARN_ON(1); \ | 28 | WARN_ON(1); \ |
| 29 | __ret = 1; \ | 29 | __ret = 1; \ |
| 30 | } \ | 30 | } \ |