aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/sys/mutex.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/include/sys/mutex.h b/include/sys/mutex.h
index 319235223..d6bd99b4c 100644
--- a/include/sys/mutex.h
+++ b/include/sys/mutex.h
@@ -40,10 +40,8 @@ typedef enum {
typedef struct {
struct mutex m_mutex;
spinlock_t m_lock; /* used for serializing mutex_exit */
-#ifndef HAVE_MUTEX_OWNER
/* only when kernel doesn't have owner */
kthread_t *m_owner;
-#endif
#ifdef CONFIG_LOCKDEP
kmutex_type_t m_type;
#endif /* CONFIG_LOCKDEP */
@@ -58,24 +56,16 @@ spl_mutex_set_owner(kmutex_t *mp)
* kernel will handle its owner, so we don't need to do anything if it
* is defined.
*/
-#ifndef HAVE_MUTEX_OWNER
mp->m_owner = current;
-#endif
}
static inline void
spl_mutex_clear_owner(kmutex_t *mp)
{
-#ifndef HAVE_MUTEX_OWNER
mp->m_owner = NULL;
-#endif
}
-#ifdef HAVE_MUTEX_OWNER
#define mutex_owner(mp) (ACCESS_ONCE(MUTEX(mp)->owner))
-#else
-#define mutex_owner(mp) (ACCESS_ONCE((mp)->m_owner))
-#endif
#define mutex_owned(mp) (mutex_owner(mp) == current)
#define MUTEX_HELD(mp) mutex_owned(mp)
#define MUTEX_NOT_HELD(mp) (!MUTEX_HELD(mp))