From fdce8919a0ff8066caf56fc0936a701db261909e Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Sat, 28 Aug 2010 17:30:29 -0700
Subject: [PATCH] kernel - All lwkt thread now start out mpsafe part 2/2

* Remove the TDF_MPSAFE flag entirely.  All thread creation of all
  types now start running the thread without the mplock.

  Drivers which aren't mpsafe immediately acquire the mplock.
---
 sys/dev/netif/iwl/if_iwl.c                   |  2 +-
 sys/kern/dsched/fq/fq_diskops.c              |  8 +++++---
 sys/kern/init_main.c                         |  3 +--
 sys/kern/kern_fork.c                         |  2 +-
 sys/kern/kern_intr.c                         | 14 ++++++--------
 sys/kern/kern_kthread.c                      |  8 +++-----
 sys/kern/kern_nrandom.c                      |  3 +--
 sys/kern/kern_timeout.c                      |  2 +-
 sys/kern/lwkt_thread.c                       | 12 +++++-------
 sys/kern/subr_bus.c                          |  3 +--
 sys/kern/subr_disk.c                         |  2 +-
 sys/kern/subr_taskqueue.c                    | 10 ++++++----
 sys/kern/usched_bsd4.c                       |  2 +-
 sys/kern/usched_dummy.c                      |  2 +-
 sys/kern/vfs_journal.c                       |  8 ++++----
 sys/net/if.c                                 |  3 ++-
 sys/net/netisr.c                             |  4 ++--
 sys/net/route.c                              |  2 +-
 sys/netinet/ip_demux.c                       |  4 ++--
 sys/netinet/tcp_subr.c                       |  2 +-
 sys/platform/pc32/i386/machdep.c             |  2 +-
 sys/platform/pc64/x86_64/machdep.c           |  2 +-
 sys/platform/vkernel/platform/globaldata.c   |  2 +-
 sys/platform/vkernel64/platform/globaldata.c |  2 +-
 sys/sys/thread.h                             |  2 +-
 sys/vfs/devfs/devfs_core.c                   |  2 +-
 sys/vfs/hammer/hammer_flusher.c              |  4 ++--
 sys/vfs/nfs/nfs_vfsops.c                     |  4 ++--
 28 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/sys/dev/netif/iwl/if_iwl.c b/sys/dev/netif/iwl/if_iwl.c
index e38bd3cdb9..f1a19ff559 100644
--- a/sys/dev/netif/iwl/if_iwl.c
+++ b/sys/dev/netif/iwl/if_iwl.c
@@ -503,7 +503,7 @@ iwl_create_thread(struct iwlcom *iwl, int unit)
 	iwl->iwl_thread_port.mp_putport = iwl_put_port;
 
 	lwkt_create(iwl_service_loop, iwl, NULL, &iwl->iwl_thread,
-		    TDF_MPSAFE, unit % ncpus, "iwl%d", unit);
+		    0, unit % ncpus, "iwl%d", unit);
 }
 
 static void
diff --git a/sys/kern/dsched/fq/fq_diskops.c b/sys/kern/dsched/fq/fq_diskops.c
index 3156853b31..487ea51901 100644
--- a/sys/kern/dsched/fq/fq_diskops.c
+++ b/sys/kern/dsched/fq/fq_diskops.c
@@ -73,10 +73,12 @@ fq_prepare(struct dsched_disk_ctx *ds_diskctx)
 	struct	fq_disk_ctx	*diskctx = (struct fq_disk_ctx *)ds_diskctx;
 	struct thread *td_core, *td_balance;
 
-	lwkt_create((void (*)(void *))fq_dispatcher, diskctx, &td_core, NULL,
-	    TDF_MPSAFE, -1, "fq_dispatch_%s", ds_diskctx->dp->d_cdev->si_name);
+	lwkt_create((void (*)(void *))fq_dispatcher, diskctx, &td_core,
+		    NULL, 0, -1, "fq_dispatch_%s",
+		    ds_diskctx->dp->d_cdev->si_name);
 	lwkt_create((void (*)(void *))fq_balance_thread, diskctx, &td_balance,
-	    NULL, TDF_MPSAFE, -1, "fq_balance_%s", ds_diskctx->dp->d_cdev->si_name);
+		    NULL, 0, -1, "fq_balance_%s",
+		    ds_diskctx->dp->d_cdev->si_name);
 	diskctx->td_balance = td_balance;
 
 	return 0;
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index d56243690f..b62ea10ab8 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -161,8 +161,7 @@ sysinit_add(struct sysinit **set, struct sysinit **set_end)
 void
 mi_proc0init(struct globaldata *gd, struct user *proc0paddr)
 {
-	lwkt_init_thread(&thread0, proc0paddr, LWKT_THREAD_STACK,
-			 TDF_MPSAFE, gd);
+	lwkt_init_thread(&thread0, proc0paddr, LWKT_THREAD_STACK, 0, gd);
 	lwkt_set_comm(&thread0, "thread0");
 #ifdef SMP
 	thread0.td_mpcount = 1;	/* will hold mplock initially */
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 3cfa02f052..87a4077b94 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -617,7 +617,7 @@ lwp_fork(struct lwp *origlp, struct proc *destproc, int flags)
 	destproc->p_lasttid = lp->lwp_tid;
 	destproc->p_nthreads++;
 
-	td = lwkt_alloc_thread(NULL, LWKT_THREAD_STACK, -1, TDF_MPSAFE);
+	td = lwkt_alloc_thread(NULL, LWKT_THREAD_STACK, -1, 0);
 	lp->lwp_thread = td;
 	td->td_proc = destproc;
 	td->td_lwp = lp;
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index f4efa9d025..39160d2ef6 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -220,10 +220,8 @@ register_int(int intr, inthand2_t *handler, void *arg, const char *name,
      * it up.
      */
     if (emergency_intr_thread.td_kstack == NULL) {
-	lwkt_create(ithread_emergency, NULL, NULL,
-		    &emergency_intr_thread,
-		    TDF_STOPREQ|TDF_INTTHREAD|TDF_MPSAFE,
-		    -1, "ithread emerg");
+	lwkt_create(ithread_emergency, NULL, NULL, &emergency_intr_thread,
+		    TDF_STOPREQ | TDF_INTTHREAD, -1, "ithread emerg");
 	systimer_init_periodic_nq(&emergency_intr_timer,
 		    emergency_intr_timer_callback, &emergency_intr_thread, 
 		    (emergency_intr_enable ? emergency_intr_freq : 1));
@@ -237,9 +235,9 @@ register_int(int intr, inthand2_t *handler, void *arg, const char *name,
      */
     if (info->i_state == ISTATE_NOTHREAD) {
 	info->i_state = ISTATE_NORMAL;
-	lwkt_create((void *)ithread_handler, (void *)(intptr_t)intr, NULL,
-	    &info->i_thread, TDF_STOPREQ|TDF_INTTHREAD|TDF_MPSAFE, -1, 
-	    "ithread %d", intr);
+	lwkt_create(ithread_handler, (void *)(intptr_t)intr, NULL,
+		    &info->i_thread, TDF_STOPREQ | TDF_INTTHREAD, -1,
+		    "ithread %d", intr);
 	if (intr >= FIRST_SOFTINT)
 	    lwkt_setpri(&info->i_thread, TDPRI_SOFT_NORM);
 	else
@@ -741,7 +739,7 @@ ithread_handler(void *arg)
 
     /*
      * The loop must be entered with one critical section held.  The thread
-     * is created with TDF_MPSAFE so the MP lock is not held on start.
+     * does not hold the mplock on startup.
      */
     gd = mycpu;
     lseconds = gd->gd_time_seconds;
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index f9f39983f0..4778078310 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -57,8 +57,7 @@ kthread_create(void (*func)(void *), void *arg,
     thread_t td;
     __va_list ap;
 
-    td = lwkt_alloc_thread(NULL, LWKT_THREAD_STACK, -1,
-			   TDF_VERBOSE | TDF_MPSAFE);
+    td = lwkt_alloc_thread(NULL, LWKT_THREAD_STACK, -1, TDF_VERBOSE);
     if (tdp)
 	*tdp = td;
     cpu_set_thread_handler(td, kthread_exit, func, arg);
@@ -86,8 +85,7 @@ kthread_create_cpu(void (*func)(void *), void *arg,
     thread_t td;
     __va_list ap;
 
-    td = lwkt_alloc_thread(NULL, LWKT_THREAD_STACK, cpu,
-			   TDF_VERBOSE | TDF_MPSAFE);
+    td = lwkt_alloc_thread(NULL, LWKT_THREAD_STACK, cpu, TDF_VERBOSE);
     if (tdp)
 	*tdp = td;
     cpu_set_thread_handler(td, kthread_exit, func, arg);
@@ -118,7 +116,7 @@ kthread_create_stk(void (*func)(void *), void *arg,
     thread_t td;
     __va_list ap;
 
-    td = lwkt_alloc_thread(NULL, stksize, -1, TDF_VERBOSE | TDF_MPSAFE);
+    td = lwkt_alloc_thread(NULL, stksize, -1, TDF_VERBOSE);
     if (tdp)
 	*tdp = td;
     cpu_set_thread_handler(td, kthread_exit, func, arg);
diff --git a/sys/kern/kern_nrandom.c b/sys/kern/kern_nrandom.c
index 2a140bb4aa..5103885c4c 100644
--- a/sys/kern/kern_nrandom.c
+++ b/sys/kern/kern_nrandom.c
@@ -599,8 +599,7 @@ static
 void
 rand_thread_init(void)
 {
-	lwkt_create(rand_thread_loop, NULL, &rand_td, NULL,
-		    TDF_MPSAFE, 0, "random");
+	lwkt_create(rand_thread_loop, NULL, &rand_td, NULL, 0, 0, "random");
 }
 
 SYSINIT(rand, SI_SUB_HELPER_THREADS, SI_ORDER_ANY, rand_thread_init, 0);
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index f27f209152..09b8470ed1 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -177,7 +177,7 @@ swi_softclock_setup(void *arg)
 		 * the cpu they were scheduled on.
 		 */
 		lwkt_create(softclock_handler, sc, NULL,
-			    &sc->thread, TDF_STOPREQ|TDF_INTTHREAD|TDF_MPSAFE,
+			    &sc->thread, TDF_STOPREQ | TDF_INTTHREAD,
 			    cpu, "softclock %d", cpu);
 	}
 }
diff --git a/sys/kern/lwkt_thread.c b/sys/kern/lwkt_thread.c
index 1311f37dff..964ddc20d5 100644
--- a/sys/kern/lwkt_thread.c
+++ b/sys/kern/lwkt_thread.c
@@ -368,15 +368,17 @@ lwkt_init_thread_remote(void *arg)
 
 #endif
 
+/*
+ * lwkt core thread structural initialization.
+ *
+ * NOTE: All threads are initialized as mpsafe threads.
+ */
 void
 lwkt_init_thread(thread_t td, void *stack, int stksize, int flags,
 		struct globaldata *gd)
 {
     globaldata_t mygd = mycpu;
 
-    /* all threads start mpsafe now */
-    KKASSERT(flags & TDF_MPSAFE);
-
     bzero(td, sizeof(struct thread));
     td->td_kstack = stack;
     td->td_kstack_size = stksize;
@@ -385,10 +387,6 @@ lwkt_init_thread(thread_t td, void *stack, int stksize, int flags,
     td->td_pri = TDPRI_KERN_DAEMON;
     td->td_critcount = 1;
     td->td_toks_stop = &td->td_toks_base;
-#ifdef SMP
-    if ((flags & TDF_MPSAFE) == 0)
-	td->td_mpcount = 1;
-#endif
     if (lwkt_use_spin_port)
 	lwkt_initport_spin(&td->td_msgport);
     else
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 312c29c759..26cdd6f38e 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -1674,8 +1674,7 @@ device_attach_async(device_t dev)
 
 	atomic_add_int(&numasyncthreads, 1);
 	lwkt_create(device_attach_thread, dev, &td, NULL,
-		    TDF_MPSAFE, 0,
-		    (dev->desc ? dev->desc : "devattach"));
+		    0, 0, (dev->desc ? dev->desc : "devattach"));
 }
 
 static void
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index b9e84e1564..7e889a7c55 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1281,7 +1281,7 @@ disk_init(void)
 
 	lwkt_gettoken(&disklist_token);
 	lwkt_create(disk_msg_core, /*args*/NULL, &td_core, NULL,
-		    TDF_MPSAFE, 0, "disk_msg_core");
+		    0, 0, "disk_msg_core");
 	tsleep(td_core, 0, "diskcore", 0);
 	lwkt_reltoken(&disklist_token);
 }
diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c
index de294aa7ec..94dc6344af 100644
--- a/sys/kern/subr_taskqueue.c
+++ b/sys/kern/subr_taskqueue.c
@@ -339,12 +339,14 @@ taskqueue_start_threads(struct taskqueue **tqp, int count, int pri, int ncpu,
 
 		if (count == 1) {
 			error = lwkt_create(taskqueue_thread_loop, tqp,
-			    &tq->tq_threads[i], NULL, TDF_STOPREQ | TDF_MPSAFE,
-			    cpu, "%s", ktname);
+					    &tq->tq_threads[i], NULL,
+					    TDF_STOPREQ, cpu,
+					    "%s", ktname);
 		} else {
 			error = lwkt_create(taskqueue_thread_loop, tqp,
-			    &tq->tq_threads[i], NULL, TDF_STOPREQ | TDF_MPSAFE,
-			    cpu, "%s_%d", ktname, i);
+					    &tq->tq_threads[i], NULL,
+					    TDF_STOPREQ, cpu,
+					    "%s_%d", ktname, i);
 		}
 		if (error) {
 			kprintf("%s: kthread_add(%s): error %d", __func__,
diff --git a/sys/kern/usched_bsd4.c b/sys/kern/usched_bsd4.c
index 8c208c2dfe..18096f4d40 100644
--- a/sys/kern/usched_bsd4.c
+++ b/sys/kern/usched_bsd4.c
@@ -1195,7 +1195,7 @@ sched_thread_cpu_init(void)
 	    kprintf(" %d", i);
 
 	lwkt_create(sched_thread, NULL, NULL, &dd->helper_thread, 
-		    TDF_STOPREQ | TDF_MPSAFE, i, "usched %d", i);
+		    TDF_STOPREQ, i, "usched %d", i);
 
 	/*
 	 * Allow user scheduling on the target cpu.  cpu #0 has already
diff --git a/sys/kern/usched_dummy.c b/sys/kern/usched_dummy.c
index fb22eb8dcb..e66ae7cd90 100644
--- a/sys/kern/usched_dummy.c
+++ b/sys/kern/usched_dummy.c
@@ -537,7 +537,7 @@ dummy_sched_thread_cpu_init(void)
 	    kprintf(" %d", i);
 
 	lwkt_create(dummy_sched_thread, NULL, NULL, &dd->helper_thread, 
-		    TDF_STOPREQ | TDF_MPSAFE, i, "dsched %d", i);
+		    TDF_STOPREQ, i, "dsched %d", i);
 
 	/*
 	 * Allow user scheduling on the target cpu.  cpu #0 has already
diff --git a/sys/kern/vfs_journal.c b/sys/kern/vfs_journal.c
index f13c18429b..03193d8c57 100644
--- a/sys/kern/vfs_journal.c
+++ b/sys/kern/vfs_journal.c
@@ -120,16 +120,16 @@ journal_create_threads(struct journal *jo)
 	jo->flags &= ~(MC_JOURNAL_STOP_REQ | MC_JOURNAL_STOP_IMM);
 	jo->flags |= MC_JOURNAL_WACTIVE;
 	lwkt_create(journal_wthread, jo, NULL, &jo->wthread,
-		    TDF_STOPREQ | TDF_MPSAFE,
-		    -1, "journal w:%.*s", JIDMAX, jo->id);
+		    TDF_STOPREQ, -1,
+		    "journal w:%.*s", JIDMAX, jo->id);
 	lwkt_setpri(&jo->wthread, TDPRI_KERN_DAEMON);
 	lwkt_schedule(&jo->wthread);
 
 	if (jo->flags & MC_JOURNAL_WANT_FULLDUPLEX) {
 	    jo->flags |= MC_JOURNAL_RACTIVE;
 	    lwkt_create(journal_rthread, jo, NULL, &jo->rthread,
-			TDF_STOPREQ | TDF_MPSAFE,
-			-1, "journal r:%.*s", JIDMAX, jo->id);
+			TDF_STOPREQ, -1,
+			"journal r:%.*s", JIDMAX, jo->id);
 	    lwkt_setpri(&jo->rthread, TDPRI_KERN_DAEMON);
 	    lwkt_schedule(&jo->rthread);
 	}
diff --git a/sys/net/if.c b/sys/net/if.c
index 34ba9d2701..8fd4813c96 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -2495,7 +2495,8 @@ ifnetinit(void *dummy __unused)
 		struct thread *thr = &ifnet_threads[i];
 
 		lwkt_create(netmsg_service_loop, &ifnet_mpsafe_thread, NULL,
-			    thr, TDF_NETWORK | TDF_MPSAFE, i, "ifnet %d", i);
+			    thr, TDF_NETWORK, i,
+			    "ifnet %d", i);
 		netmsg_service_port_init(&thr->td_msgport);
 	}
 }
diff --git a/sys/net/netisr.c b/sys/net/netisr.c
index 209aedec49..f28626e2e3 100644
--- a/sys/net/netisr.c
+++ b/sys/net/netisr.c
@@ -177,7 +177,7 @@ netisr_init(void)
      */
     for (i = 0; i < ncpus; ++i) {
 	lwkt_create(netmsg_service_loop, &netisr_mpsafe_thread, NULL,
-		    &netisr_cpu[i], TDF_NETWORK | TDF_MPSAFE, i,
+		    &netisr_cpu[i], TDF_NETWORK, i,
 		    "netisr_cpu %d", i);
 	netmsg_service_port_init(&netisr_cpu[i].td_msgport);
     }
@@ -346,7 +346,7 @@ netmsg_service_loop(void *arg)
     int mplocked, *mpsafe_mode = arg;
 
     /*
-     * Thread was started with TDF_MPSAFE
+     * Threads always start mpsafe.
      */
     mplocked = 0;
 
diff --git a/sys/net/route.c b/sys/net/route.c
index c7d8b5ec1c..f3ebb80222 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -154,7 +154,7 @@ route_init(void)
 
 	for (cpu = 0; cpu < ncpus; cpu++) {
 		lwkt_create(rtable_service_loop, NULL, &rtd, NULL,
-			    TDF_MPSAFE, cpu, "rtable_cpu %d", cpu);
+			    0, cpu, "rtable_cpu %d", cpu);
 		rt_ports[cpu] = &rtd->td_msgport;
 	}
 }
diff --git a/sys/netinet/ip_demux.c b/sys/netinet/ip_demux.c
index 046ebba0af..5a0d164bb3 100644
--- a/sys/netinet/ip_demux.c
+++ b/sys/netinet/ip_demux.c
@@ -568,7 +568,7 @@ tcp_thread_init(void)
 
 	for (cpu = 0; cpu < ncpus2; cpu++) {
 		lwkt_create(tcpmsg_service_loop, NULL, NULL,
-			    &tcp_thread[cpu], TDF_NETWORK | TDF_MPSAFE, cpu,
+			    &tcp_thread[cpu], TDF_NETWORK, cpu,
 			    "tcp_thread %d", cpu);
 		netmsg_service_port_init(&tcp_thread[cpu].td_msgport);
 	}
@@ -581,7 +581,7 @@ udp_thread_init(void)
 
 	for (cpu = 0; cpu < ncpus2; cpu++) {
 		lwkt_create(netmsg_service_loop, &udp_mpsafe_thread, NULL,
-			    &udp_thread[cpu], TDF_NETWORK | TDF_MPSAFE, cpu,
+			    &udp_thread[cpu], TDF_NETWORK, cpu,
 			    "udp_thread %d", cpu);
 		netmsg_service_port_init(&udp_thread[cpu].td_msgport);
 	}
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index c24f49652d..ab3327e3df 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -400,7 +400,7 @@ tcpmsg_service_loop(void *dummy)
 	int mplocked;
 
 	/*
-	 * Thread was started with TDF_MPSAFE
+	 * Threads always start mpsafe.
 	 */
 	mplocked = 0;
 
diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c
index 1ccf9b0779..668edd8230 100644
--- a/sys/platform/pc32/i386/machdep.c
+++ b/sys/platform/pc32/i386/machdep.c
@@ -2105,7 +2105,7 @@ cpu_gdinit(struct mdglobaldata *gd, int cpu)
 	lwkt_init_thread(&gd->mi.gd_idlethread, 
 			gd->mi.gd_prvspace->idlestack, 
 			sizeof(gd->mi.gd_prvspace->idlestack), 
-			TDF_MPSAFE, &gd->mi);
+			0, &gd->mi);
 	lwkt_set_comm(&gd->mi.gd_idlethread, "idle_%d", cpu);
 	gd->mi.gd_idlethread.td_switch = cpu_lwkt_switch;
 	gd->mi.gd_idlethread.td_sp -= sizeof(void *);
diff --git a/sys/platform/pc64/x86_64/machdep.c b/sys/platform/pc64/x86_64/machdep.c
index 426462d336..7836d18019 100644
--- a/sys/platform/pc64/x86_64/machdep.c
+++ b/sys/platform/pc64/x86_64/machdep.c
@@ -1872,7 +1872,7 @@ cpu_gdinit(struct mdglobaldata *gd, int cpu)
 	lwkt_init_thread(&gd->mi.gd_idlethread, 
 			gd->mi.gd_prvspace->idlestack, 
 			sizeof(gd->mi.gd_prvspace->idlestack), 
-			TDF_MPSAFE, &gd->mi);
+			0, &gd->mi);
 	lwkt_set_comm(&gd->mi.gd_idlethread, "idle_%d", cpu);
 	gd->mi.gd_idlethread.td_switch = cpu_lwkt_switch;
 	gd->mi.gd_idlethread.td_sp -= sizeof(void *);
diff --git a/sys/platform/vkernel/platform/globaldata.c b/sys/platform/vkernel/platform/globaldata.c
index e0a762b790..9b956bf8e3 100644
--- a/sys/platform/vkernel/platform/globaldata.c
+++ b/sys/platform/vkernel/platform/globaldata.c
@@ -71,7 +71,7 @@ cpu_gdinit(struct mdglobaldata *gd, int cpu)
 	lwkt_init_thread(&gd->mi.gd_idlethread,
 			gd->mi.gd_prvspace->idlestack,
 			sizeof(gd->mi.gd_prvspace->idlestack),
-			TDF_MPSAFE, &gd->mi);
+			0, &gd->mi);
 	lwkt_set_comm(&gd->mi.gd_idlethread, "idle_%d", cpu);
 	gd->mi.gd_idlethread.td_switch = cpu_lwkt_switch;
 	gd->mi.gd_idlethread.td_sp -= sizeof(void *);
diff --git a/sys/platform/vkernel64/platform/globaldata.c b/sys/platform/vkernel64/platform/globaldata.c
index cd7da8288d..163b2b0060 100644
--- a/sys/platform/vkernel64/platform/globaldata.c
+++ b/sys/platform/vkernel64/platform/globaldata.c
@@ -71,7 +71,7 @@ cpu_gdinit(struct mdglobaldata *gd, int cpu)
 	lwkt_init_thread(&gd->mi.gd_idlethread,
 			gd->mi.gd_prvspace->idlestack,
 			sizeof(gd->mi.gd_prvspace->idlestack),
-			TDF_MPSAFE, &gd->mi);
+			0, &gd->mi);
 	lwkt_set_comm(&gd->mi.gd_idlethread, "idle_%d", cpu);
 	gd->mi.gd_idlethread.td_switch = cpu_lwkt_switch;
 	gd->mi.gd_idlethread.td_sp -= sizeof(void *);
diff --git a/sys/sys/thread.h b/sys/sys/thread.h
index 0559377256..d6730ae6cf 100644
--- a/sys/sys/thread.h
+++ b/sys/sys/thread.h
@@ -309,7 +309,7 @@ struct thread {
 #define TDF_BLOCKED		0x00040000	/* Thread is blocked */
 #define TDF_PANICWARN		0x00080000	/* panic warning in switch */
 #define TDF_BLOCKQ		0x00100000	/* on block queue */
-#define TDF_MPSAFE		0x00200000	/* (thread creation) */
+#define TDF_UNUSED200000	0x00200000
 #define TDF_EXITING		0x00400000	/* thread exiting */
 #define TDF_USINGFP		0x00800000	/* thread using fp coproc */
 #define TDF_KERNELFP		0x01000000	/* kernel using fp coproc */
diff --git a/sys/vfs/devfs/devfs_core.c b/sys/vfs/devfs/devfs_core.c
index 1db3c477af..f0a8a0eaca 100644
--- a/sys/vfs/devfs/devfs_core.c
+++ b/sys/vfs/devfs/devfs_core.c
@@ -2374,7 +2374,7 @@ devfs_init(void)
 
 	lockmgr(&devfs_lock, LK_EXCLUSIVE);
 	lwkt_create(devfs_msg_core, /*args*/NULL, &td_core, NULL,
-		    TDF_MPSAFE, 0, "devfs_msg_core");
+		    0, 0, "devfs_msg_core");
 	while (devfs_run == 0)
 		lksleep(td_core, &devfs_lock, 0, "devfsc", 0);
 	lockmgr(&devfs_lock, LK_RELEASE);
diff --git a/sys/vfs/hammer/hammer_flusher.c b/sys/vfs/hammer/hammer_flusher.c
index 45bdfa3a37..f86f78304b 100644
--- a/sys/vfs/hammer/hammer_flusher.c
+++ b/sys/vfs/hammer/hammer_flusher.c
@@ -171,13 +171,13 @@ hammer_flusher_create(hammer_mount_t hmp)
 	TAILQ_INIT(&hmp->flusher.ready_list);
 
 	lwkt_create(hammer_flusher_master_thread, hmp,
-		    &hmp->flusher.td, NULL, TDF_MPSAFE, -1, "hammer-M");
+		    &hmp->flusher.td, NULL, 0, -1, "hammer-M");
 	for (i = 0; i < HAMMER_MAX_FLUSHERS; ++i) {
 		info = kmalloc(sizeof(*info), hmp->m_misc, M_WAITOK|M_ZERO);
 		info->hmp = hmp;
 		TAILQ_INSERT_TAIL(&hmp->flusher.ready_list, info, entry);
 		lwkt_create(hammer_flusher_slave_thread, info,
-			    &info->td, NULL, TDF_MPSAFE, -1, "hammer-S%d", i);
+			    &info->td, NULL, 0, -1, "hammer-S%d", i);
 	}
 }
 
diff --git a/sys/vfs/nfs/nfs_vfsops.c b/sys/vfs/nfs/nfs_vfsops.c
index c291c7a8f6..88431aafd7 100644
--- a/sys/vfs/nfs/nfs_vfsops.c
+++ b/sys/vfs/nfs/nfs_vfsops.c
@@ -1121,9 +1121,9 @@ mountnfs(struct nfs_args *argp, struct mount *mp, struct sockaddr *nam,
 	 * Start the reader and writer threads.
 	 */
 	lwkt_create(nfssvc_iod_reader, nmp, &nmp->nm_rxthread,
-		    NULL, TDF_MPSAFE, rxcpu, "nfsiod_rx");
+		    NULL, 0, rxcpu, "nfsiod_rx");
 	lwkt_create(nfssvc_iod_writer, nmp, &nmp->nm_txthread,
-		    NULL, TDF_MPSAFE, txcpu, "nfsiod_tx");
+		    NULL, 0, txcpu, "nfsiod_tx");
 
 	return (0);
 bad:
-- 
2.41.0