linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / mutex-debug.h

diff --git a/include/linux/mutex-debug.h b/include/linux/mutex-debug.h
index 2537285..8b5769f 100644 (file)
--- a/include/linux/mutex-debug.h
+++ b/include/linux/mutex-debug.h
@@ -2,22 +2,22 @@
 #define __LINUX_MUTEX_DEBUG_H
 
 #include <linux/linkage.h>
-#include <linux/lockdep.h>
 
 /*
  * Mutexes - debugging helpers:
  */
 
-#define __DEBUG_MUTEX_INITIALIZER(lockname)                            \
-       , .magic = &lockname
+#define __DEBUG_MUTEX_INITIALIZER(lockname) \
+       , .held_list = LIST_HEAD_INIT(lockname.held_list), \
+         .name = #lockname , .magic = &lockname
 
-#define mutex_init(mutex)                                              \
-do {                                                                   \
-       static struct lock_class_key __key;                             \
-                                                                       \
-       __mutex_init((mutex), #mutex, &__key);                          \
-} while (0)
+#define mutex_init(sem)                __mutex_init(sem, __FUNCTION__)
 
 extern void FASTCALL(mutex_destroy(struct mutex *lock));
 
+extern void mutex_debug_show_all_locks(void);
+extern void mutex_debug_show_held_locks(struct task_struct *filter);
+extern void mutex_debug_check_no_locks_held(struct task_struct *task);
+extern void mutex_debug_check_no_locks_freed(const void *from, unsigned long len);
+
 #endif