diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-13 14:41:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-13 14:41:05 -0700 |
| commit | 83400207a07584539366f6859362db6872809a12 (patch) | |
| tree | fad187f8b3bebf1b387ec42ef8143e6f4e49a256 /lib/debug_locks.c | |
| parent | 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
| download | linux-83400207a07584539366f6859362db6872809a12.tar.gz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
MAINTAINERS
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; */ int debug_locks_off(void) { - if (xchg(&debug_locks, 0)) { + if (__debug_locks_off()) { if (!debug_locks_silent) { oops_in_progress = 1; console_verbose(); |