diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 7b66186ee24a..884eeda0b134 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -417,10 +417,10 @@ _mtx_trylock(struct mtx *m, int opts, const char *file, int line)
  * sleep waiting for it), or if we need to recurse on it.
  */
 void
-_mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
+_mtx_lock_sleep(struct mtx *m, struct thread *td, int opts, const char *file,
+    int line)
 {
 	struct turnstile *ts;
-	struct thread *td = curthread;
 #if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES)
 	struct thread *owner;
 #endif
@@ -562,7 +562,8 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
  * is handled inline.
  */
 void
-_mtx_lock_spin(struct mtx *m, int opts, const char *file, int line)
+_mtx_lock_spin(struct mtx *m, struct thread *td, int opts, const char *file,
+    int line)
 {
 	int i = 0;
 
@@ -570,7 +571,7 @@ _mtx_lock_spin(struct mtx *m, int opts, const char *file, int line)
 		CTR1(KTR_LOCK, "_mtx_lock_spin: %p spinning", m);
 
 	for (;;) {
-		if (_obtain_lock(m, curthread))
+		if (_obtain_lock(m, td))
 			break;
 
 		/* Give interrupts a chance while we spin. */
diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h
index be78144af850..22756857dca0 100644
--- a/sys/sys/mutex.h
+++ b/sys/sys/mutex.h
@@ -100,17 +100,19 @@ void	mtx_init(struct mtx *m, const char *name, const char *type, int opts);
 void	mtx_destroy(struct mtx *m);
 void	mtx_sysinit(void *arg);
 void	mutex_init(void);
-void	_mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line);
+void	_mtx_lock_sleep(struct mtx *m, struct thread *td, int opts,
+	    const char *file, int line);
 void	_mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line);
-void	_mtx_lock_spin(struct mtx *m, int opts, const char *file, int line);
+void	_mtx_lock_spin(struct mtx *m, struct thread *td, int opts,
+	    const char *file, int line);
 void	_mtx_unlock_spin(struct mtx *m, int opts, const char *file, int line);
 int	_mtx_trylock(struct mtx *m, int opts, const char *file, int line);
 void	_mtx_lock_flags(struct mtx *m, int opts, const char *file, int line);
 void	_mtx_unlock_flags(struct mtx *m, int opts, const char *file, int line);
 void	_mtx_lock_spin_flags(struct mtx *m, int opts, const char *file,
-			     int line);
+	     int line);
 void	_mtx_unlock_spin_flags(struct mtx *m, int opts, const char *file,
-			     int line);
+	     int line);
 #ifdef INVARIANT_SUPPORT
 void	_mtx_assert(struct mtx *m, int what, const char *file, int line);
 #endif
@@ -144,8 +146,10 @@ void	_mtx_assert(struct mtx *m, int what, const char *file, int line);
  */
 #ifndef _get_sleep_lock
 #define _get_sleep_lock(mp, tid, opts, file, line) do {			\
-	if (!_obtain_lock((mp), (tid)))					\
-		_mtx_lock_sleep((mp), (opts), (file), (line));		\
+	struct thread *_tid = (tid);					\
+									\
+	if (!_obtain_lock((mp), _tid))					\
+		_mtx_lock_sleep((mp), _tid, (opts), (file), (line));	\
 } while (0)
 #endif
 
@@ -158,12 +162,14 @@ void	_mtx_assert(struct mtx *m, int what, const char *file, int line);
  */
 #ifndef _get_spin_lock
 #define _get_spin_lock(mp, tid, opts, file, line) do {			\
+	struct thread *_tid = (tid);					\
+									\
 	critical_enter();						\
-	if (!_obtain_lock((mp), (tid))) {				\
-		if ((mp)->mtx_lock == (uintptr_t)(tid))			\
+	if (!_obtain_lock((mp), _tid)) {				\
+		if ((mp)->mtx_lock == (uintptr_t)_tid)			\
 			(mp)->mtx_recurse++;				\
 		else							\
-			_mtx_lock_spin((mp), (opts), (file), (line));	\
+			_mtx_lock_spin((mp), _tid, (opts), (file), (line)); \
 	}								\
 } while (0)
 #endif