From 1273cf284b4e916fdf6dfbdf1fdb720d62738663 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Sun, 15 Nov 2009 15:04:02 -0800 Subject: [PATCH] Always use the generic mutex_destroy(). --- include/sys/mutex.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/sys/mutex.h b/include/sys/mutex.h index 596c15612..1eedd4565 100644 --- a/include/sys/mutex.h +++ b/include/sys/mutex.h @@ -59,17 +59,21 @@ mutex_owner(kmutex_t *mp) __mutex_init((mp), #mp, &__key); \ }) +#undef mutex_destroy +#define mutex_destroy(mp) \ +({ \ + VERIFY(!MUTEX_HELD(mp)); \ +}) + #define mutex_tryenter(mp) mutex_trylock(mp) #define mutex_enter(mp) mutex_lock(mp) #define mutex_exit(mp) mutex_unlock(mp) + #ifdef HAVE_GPL_ONLY_SYMBOLS # define mutex_enter_nested(mp, sc) mutex_lock_nested(mp, sc) #else # define mutex_enter_nested(mp, sc) mutex_enter(mp) -# ifdef CONFIG_DEBUG_MUTEXES -# define mutex_destroy(mp) ((void)0) -# endif /* CONFIG_DEBUG_MUTEXES */ #endif /* HAVE_GPL_ONLY_SYMBOLS */ #else /* HAVE_MUTEX_OWNER */