X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=kernel%2Fmutex-debug.c;h=841539d72c55cdbb674b7a91786847c37ec5acdb;hb=e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7;hp=e3203c654dda80ab646ffcbd4b0306e942fde846;hpb=ae3e0218621db0590163b2d5c424ef1f340e3cc6;p=mv-sheeva.git

diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
index e3203c654dd..841539d72c5 100644
--- a/kernel/mutex-debug.c
+++ b/kernel/mutex-debug.c
@@ -77,6 +77,9 @@ void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
 
 void debug_mutex_unlock(struct mutex *lock)
 {
+	if (unlikely(!debug_locks))
+		return;
+
 	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
 	DEBUG_LOCKS_WARN_ON(lock->magic != lock);
 	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
@@ -91,7 +94,7 @@ void debug_mutex_init(struct mutex *lock, const char *name,
 	 * 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);
+	lockdep_init_map(&lock->dep_map, name, key, 0);
 #endif
 	lock->owner = NULL;
 	lock->magic = lock;