diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
| commit | b22364c8eec89e6b0c081a237f3b6348df87796f (patch) | |
| tree | 233a923281fb640106465d076997ff511efb6edf /include/linux/debug_locks.h | |
| parent | 2c8dc071517ec2843869024dc82be2e246f41064 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge rsync://rsync.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 a1c10b0c4cf0..1678a5de7013 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_silent || 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 | } \ |