X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fmutex-debug.c;h=e3203c654dda80ab646ffcbd4b0306e942fde846;hb=e620c4940002348417e8d317d65bc7b152646493;hp=5569766a1ea2f54fac9e9f8bffdfc3472ae5184e;hpb=9a11b49a805665e13a56aa067afaf81d43ec1514;p=linux-2.6

diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
index 5569766a1e..e3203c654d 100644
--- a/kernel/mutex-debug.c
+++ b/kernel/mutex-debug.c
@@ -83,12 +83,16 @@ void debug_mutex_unlock(struct mutex *lock)
 	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
 }
 
-void debug_mutex_init(struct mutex *lock, const char *name)
+void debug_mutex_init(struct mutex *lock, const char *name,
+		      struct lock_class_key *key)
 {
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
 	/*
 	 * Make sure we are not reinitializing a held lock:
 	 */
 	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
+	lockdep_init_map(&lock->dep_map, name, key);
+#endif
 	lock->owner = NULL;
 	lock->magic = lock;
 }