Initialize thread0.td_contested in init_turnstiles() rather than

mutex_init() as it is used by the turnstile code and is not mutex-specific.

2 files changed, 1 insertions, 3 deletions

diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index f06813a..37370ca 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -904,9 +904,6 @@ void
 mutex_init(void)
 {
 
-	/* Setup thread0 so that mutexes work. */
-	LIST_INIT(&thread0.td_contested);
-
 	/* Setup turnstiles so that sleep mutexes work. */
 	init_turnstiles();
 
diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c
index 9bc1c66..57732b9 100644
--- a/sys/kern/subr_turnstile.c
+++ b/sys/kern/subr_turnstile.c
@@ -328,6 +328,7 @@ init_turnstiles(void)
 		    NULL, MTX_SPIN);
 	}
 	mtx_init(&td_contested_lock, "td_contested", NULL, MTX_SPIN);
+	LIST_INIT(&thread0.td_contested);
 	thread0.td_turnstile = NULL;
 }