3 files changed, 20 insertions, 4 deletions

diff --git a/lib/libthr/arch/i386/i386/_setcurthread.c b/lib/libthr/arch/i386/i386/_setcurthread.c
index 69a5e8f4de98..048312081d58 100644
--- a/lib/libthr/arch/i386/i386/_setcurthread.c
+++ b/lib/libthr/arch/i386/i386/_setcurthread.c
@@ -75,13 +75,15 @@ ldt_init(void)
 void
 _retire_thread(void *entry)
 {
-	_SPINLOCK(&ldt_lock);
+	pthread_t thr = curthread;
+
+	_spinlock_pthread(thr, &ldt_lock);
 	if (ldt_free == NULL)
 		*(void **)entry = NULL;
 	else
 		*(void **)entry = *ldt_free;
 	ldt_free = entry;
-	_SPINUNLOCK(&ldt_lock);
+	_spinunlock_pthread(thr, &ldt_lock);
 }
 
 void *
diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h
index 10fdda0d6196..b02df323ba98 100644
--- a/lib/libthr/thread/thr_private.h
+++ b/lib/libthr/thread/thr_private.h
@@ -713,6 +713,8 @@ int	_pthread_mutexattr_settype(pthread_mutexattr_t *, int);
 int	_pthread_once(pthread_once_t *, void (*) (void));
 pthread_t _pthread_self(void);
 int	_pthread_setspecific(pthread_key_t, const void *);
+inline void _spinlock_pthread(pthread_t, spinlock_t *);
+inline void _spinunlock_pthread(pthread_t, spinlock_t *);
 void    _thread_exit(char *, int, char *);
 void    _thread_exit_cleanup(void);
 void    *_thread_cleanup(pthread_t);
diff --git a/lib/libthr/thread/thr_spinlock.c b/lib/libthr/thread/thr_spinlock.c
index 259977a63f60..ff9b9e03a7b8 100644
--- a/lib/libthr/thread/thr_spinlock.c
+++ b/lib/libthr/thread/thr_spinlock.c
@@ -47,7 +47,13 @@
 void
 _spinunlock(spinlock_t *lck)
 {
-	if (umtx_unlock((struct umtx *)lck, curthread->thr_id))
+	_spinunlock_pthread(curthread, lck);
+}
+
+inline void
+_spinunlock_pthread(pthread_t pthread, spinlock_t *lck)
+{
+	if (umtx_unlock((struct umtx *)lck, pthread->thr_id))
 		abort();
 }
 
@@ -60,7 +66,13 @@ _spinunlock(spinlock_t *lck)
 void
 _spinlock(spinlock_t *lck)
 {
-	if (umtx_lock((struct umtx *)lck, curthread->thr_id))
+	_spinlock_pthread(curthread, lck);
+}
+
+inline void
+_spinlock_pthread(pthread_t pthread, spinlock_t *lck)
+{
+	if (umtx_lock((struct umtx *)lck, pthread->thr_id))
 		abort();
 }