diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
| commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
| tree | 1af6235c18391212c40116eb90b01eae8938efee /lib/debug_locks.c | |
| parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'lib/debug_locks.c')
| -rw-r--r-- | lib/debug_locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/debug_locks.c b/lib/debug_locks.c index 0218b4693dd8..bc3b11731b9c 100644 --- a/lib/debug_locks.c +++ b/lib/debug_locks.c | |||
| @@ -36,7 +36,7 @@ int debug_locks_silent; | |||
| 36 | */ | 36 | */ |
| 37 | int debug_locks_off(void) | 37 | int debug_locks_off(void) |
| 38 | { | 38 | { |
| 39 | if (xchg(&debug_locks, 0)) { | 39 | if (__debug_locks_off()) { |
| 40 | if (!debug_locks_silent) { | 40 | if (!debug_locks_silent) { |
| 41 | oops_in_progress = 1; | 41 | oops_in_progress = 1; |
| 42 | console_verbose(); | 42 | console_verbose(); |