projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[linux-2.6]
/
include
/
linux
/
debug_locks.h
diff --git
a/include/linux/debug_locks.h
b/include/linux/debug_locks.h
index
a1c10b0
..
1678a5d
100644
(file)
--- a/
include/linux/debug_locks.h
+++ b/
include/linux/debug_locks.h
@@
-24,7
+24,7
@@
extern int debug_locks_off(void);
int __ret = 0; \
\
if (unlikely(c)) { \
- if (debug_locks_
silent || debug_locks_off())
\
+ if (debug_locks_
off() && !debug_locks_silent)
\
WARN_ON(1); \
__ret = 1; \
} \