---

yaml --- r: 44889 b: refs/heads/master c: 9127d4b h: refs/heads/master i: 44887: 1eaedf6 v: v3
git-mirror · Dec 22, 2006 · cc0de9c · cc0de9c
1 parent 724bae5
commit cc0de9c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba3ff12fca318225cb978c6181b83d38dcbc5b09
+refs/heads/master: 9127d4b1d9b2e8fba8e7fbc7f88ea93e5eb01396
diff --git a/trunk/include/linux/debug_locks.h b/trunk/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;						\
 	}								\