X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Flinux%2Fdebug_locks.h;h=1678a5de7013a91f08f3f352a773ff90166240f1;hb=577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d;hp=952bee79a8f30902328277a6d16920a53e4da12f;hpb=97d41e90fe61399b99d74820cb7f2d6e0fbac91d;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 952bee79a8f..1678a5de701 100644
--- 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_off())					\
+		if (debug_locks_off() && !debug_locks_silent)		\
 			WARN_ON(1);					\
 		__ret = 1;						\
 	}								\