diff --git a/[refs] b/[refs] index ff44f960d120..3987feb76455 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 732375c6a5a4cc825b676c922d547aba96b8ce15 +refs/heads/master: 4582c0a4866ea70c35aa9279e1f91834d3348a93 diff --git a/trunk/include/linux/mutex.h b/trunk/include/linux/mutex.h index a940fe435aca..7f87217e9d1f 100644 --- a/trunk/include/linux/mutex.h +++ b/trunk/include/linux/mutex.h @@ -92,7 +92,7 @@ do { \ \ __mutex_init((mutex), #mutex, &__key); \ } while (0) -# define mutex_destroy(mutex) do { } while (0) +static inline void mutex_destroy(struct mutex *lock) {} #endif #ifdef CONFIG_DEBUG_LOCK_ALLOC