fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 88dafa2..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_off())                                  \
+               if (debug_locks_off() && !debug_locks_silent)           \
                        WARN_ON(1);                                     \
                __ret = 1;                                              \
        }                                                               \
@@ -43,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);