From: Ingo Molnar this should fix the bug reported Mike Galbraith: pass in a non-NULL mutex name string even if DEBUG_MUTEXES is turned off. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton --- include/linux/mutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/mutex.h~lock-validator-prove-mutex-locking-correctness-fix-null-type-name-bug include/linux/mutex.h --- devel/include/linux/mutex.h~lock-validator-prove-mutex-locking-correctness-fix-null-type-name-bug 2006-05-30 14:34:03.000000000 -0700 +++ devel-akpm/include/linux/mutex.h 2006-05-30 14:34:03.000000000 -0700 @@ -80,7 +80,7 @@ struct mutex_waiter { do { \ static struct lockdep_type_key __key; \ \ - __mutex_init((mutex), NULL, &__key); \ + __mutex_init((mutex), #mutex, &__key); \ } while (0) # define mutex_destroy(mutex) do { } while (0) #endif _