From cc0de9c01f930e069802ca59361e70153a068a75 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 22 Dec 2006 01:08:52 -0800
Subject: [PATCH] --- yaml --- r: 44889 b: refs/heads/master c:
 9127d4b1d9b2e8fba8e7fbc7f88ea93e5eb01396 h: refs/heads/master i:   44887:
 1eaedf61cabc7f174cf71dd1d0b89afae59f9bf2 v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/debug_locks.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 97bfea25e4ce..8eee71eafe34 100644
--- 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
index a1c10b0c4cf0..1678a5de7013 100644
--- 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;						\
 	}								\