X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fmutex-debug.h;h=731d77d6e155de48fed65db977d2e83843465c06;hb=7df4f694356a125e4553ca35b215fd9e88e858c5;hp=70a26091fc73f7fb942d189a56bea557efe18d6a;hpb=9a11b49a805665e13a56aa067afaf81d43ec1514;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/mutex-debug.h b/include/linux/mutex-debug.h
index 70a26091fc7..731d77d6e15 100644
--- a/include/linux/mutex-debug.h
+++ b/include/linux/mutex-debug.h
@@ -2,6 +2,7 @@
 #define __LINUX_MUTEX_DEBUG_H
 
 #include <linux/linkage.h>
+#include <linux/lockdep.h>
 
 /*
  * Mutexes - debugging helpers:
@@ -10,8 +11,13 @@
 #define __DEBUG_MUTEX_INITIALIZER(lockname)				\
 	, .magic = &lockname
 
-#define mutex_init(sem)		__mutex_init(sem, __FILE__":"#sem)
+#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_destroy(struct mutex *lock);
 
 #endif