Merge tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm...

[firefly-linux-kernel-4.4.55.git] / include / linux / mutex-debug.h

diff --git a/include/linux/mutex-debug.h b/include/linux/mutex-debug.h
index 8b5769f00467c6ea172112d6a02b80f5f8c370ca..4ac8b1977b73c53cc915b8f7ee29d87bdba8c23a 100644 (file)
--- a/include/linux/mutex-debug.h
+++ b/include/linux/mutex-debug.h
@@ -2,22 +2,23 @@
 #define __LINUX_MUTEX_DEBUG_H
 
 #include <linux/linkage.h>
+#include <linux/lockdep.h>
+#include <linux/debug_locks.h>
 
 /*
  * Mutexes - debugging helpers:
  */
 
-#define __DEBUG_MUTEX_INITIALIZER(lockname) \
-       , .held_list = LIST_HEAD_INIT(lockname.held_list), \
-         .name = #lockname , .magic = &lockname
+#define __DEBUG_MUTEX_INITIALIZER(lockname)                            \
+       , .magic = &lockname
 
-#define mutex_init(sem)                __mutex_init(sem, __FUNCTION__)
+#define mutex_init(mutex)                                              \
+do {                                                                   \
+       static struct lock_class_key __key;                             \
+                                                                       \
+       __mutex_init((mutex), #mutex, &__key);                          \
+} while (0)
 
-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);
+extern void mutex_destroy(struct mutex *lock);
 
 #endif