Pull trivial into test branch

[linux-2.6-omap-h63xx.git] / include / linux / debug_locks.h

diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 6a7047851e48b8174ffa0360e95e056a5d9921fa..a1c10b0c4cf02ae072eea67d312dbd21c236557f 100644 (file)
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -1,6 +1,8 @@
 #ifndef __LINUX_DEBUG_LOCKING_H
 #define __LINUX_DEBUG_LOCKING_H
 
+struct task_struct;
+
 extern int debug_locks;
 extern int debug_locks_silent;
 
@@ -22,7 +24,7 @@ extern int debug_locks_off(void);
        int __ret = 0;                                                  \
                                                                        \
        if (unlikely(c)) {                                              \
-               if (debug_locks_off())                                  \
+               if (debug_locks_silent || debug_locks_off())            \
                        WARN_ON(1);                                     \
                __ret = 1;                                              \
        }                                                               \
@@ -41,6 +43,8 @@ extern int debug_locks_off(void);
 # define locking_selftest()    do { } while (0)
 #endif
 
+struct task_struct;
+
 #ifdef CONFIG_LOCKDEP
 extern void debug_show_all_locks(void);
 extern void debug_show_held_locks(struct task_struct *task);