? FILES
? build.log
? experimental_sys_dirs
? s.diff
? up.out
? release/picobsd/build/build_dir-bridge
? sbin/ipfw.for-me
? share/man/man9/kproc.9
? sys/dev/dell_bios
? tools/tools/xx
? tools/tools/nanobsd/j.conf
? tools/tools/nanobsd/k.conf
? tools/tools/tinybsd/tinybsd.bin
? tools/tools/tinybsd/tinybsd.img
? usr.bin/sockstat/ddd.core
? usr.sbin/syslogd/syslogd.diff
Index: sys/cam/cam_xpt.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/cam/cam_xpt.c,v
retrieving revision 1.190
diff -d -u -r1.190 cam_xpt.c
--- sys/cam/cam_xpt.c	30 Jun 2007 14:58:56 -0000	1.190
+++ sys/cam/cam_xpt.c	20 Oct 2007 05:14:11 -0000
@@ -1562,7 +1562,7 @@
 	}
 
 	/* fire up rescan thread */
-	if (kthread_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) {
+	if (kproc_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) {
 		printf("xpt_init: failed to create rescan thread\n");
 	}
 	/* Install our software interrupt handlers */
Index: sys/compat/ndis/subr_ntoskrnl.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/compat/ndis/subr_ntoskrnl.c,v
retrieving revision 1.90
diff -d -u -r1.90 subr_ntoskrnl.c
--- sys/compat/ndis/subr_ntoskrnl.c	22 Jul 2007 20:53:28 -0000	1.90
+++ sys/compat/ndis/subr_ntoskrnl.c	20 Oct 2007 05:14:11 -0000
@@ -316,7 +316,7 @@
 		kq = kq_queues + i;
 		kq->kq_cpu = i;
 		sprintf(name, "Windows DPC %d", i);
-		error = kthread_create(ntoskrnl_dpc_thread, kq, &p,
+		error = kproc_create(ntoskrnl_dpc_thread, kq, &p,
 		    RFHIGHPID, NDIS_KSTACK_PAGES, name);
 		if (error)
 			panic("failed to launch DPC thread");
@@ -329,7 +329,7 @@
         for (i = 0; i < WORKITEM_THREADS; i++) {
 		kq = wq_queues + i;
 		sprintf(name, "Windows Workitem %d", i);
-		error = kthread_create(ntoskrnl_workitem_thread, kq, &p,
+		error = kproc_create(ntoskrnl_workitem_thread, kq, &p,
                     RFHIGHPID, NDIS_KSTACK_PAGES, name);
 		if (error)
 			panic("failed to launch workitem thread");
@@ -2801,7 +2801,7 @@
 #if __FreeBSD_version < 502113
         mtx_lock(&Giant);
 #endif
-        kthread_exit(0);
+        kproc_exit(0);
         return; /* notreached */
 }
 
@@ -3519,7 +3519,7 @@
 	tc->tc_thrfunc = thrfunc;
 
 	sprintf(tname, "windows kthread %d", ntoskrnl_kth);
-	error = kthread_create(ntoskrnl_thrfunc, tc, &p,
+	error = kproc_create(ntoskrnl_thrfunc, tc, &p,
 	    RFHIGHPID, NDIS_KSTACK_PAGES, tname);
 
 	if (error) {
@@ -3562,7 +3562,7 @@
 #if __FreeBSD_version < 502113
 	mtx_lock(&Giant);
 #endif
-	kthread_exit(0);
+	kproc_exit(0);
 	return(0);	/* notreached */
 }
 
@@ -3871,7 +3871,7 @@
 #if __FreeBSD_version < 502113
         mtx_lock(&Giant);
 #endif
-        kthread_exit(0);
+        kproc_exit(0);
         return; /* notreached */
 }
 
Index: sys/compat/opensolaris/sys/proc.h
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/compat/opensolaris/sys/proc.h,v
retrieving revision 1.2
diff -d -u -r1.2 proc.h
--- sys/compat/opensolaris/sys/proc.h	16 Aug 2007 20:33:20 -0000	1.2
+++ sys/compat/opensolaris/sys/proc.h	20 Oct 2007 05:14:12 -0000
@@ -77,12 +77,12 @@
 	ASSERT(len == 0);
 	ASSERT(state == TS_RUN);
 
-	error = kthread_create(proc, arg, &p, 0, ZFS_KSTACK_PAGES,
+	error = kproc_create(proc, arg, &p, 0, ZFS_KSTACK_PAGES,
 	    "solthread %p", proc);
 	return (error == 0 ? FIRST_THREAD_IN_PROC(p) : NULL);
 }
 
-#define	thread_exit()	kthread_exit(0)
+#define	thread_exit()	kproc_exit(0)
 
 #endif	/* _KERNEL */
 
Index: sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c,v
retrieving revision 1.4
diff -d -u -r1.4 vdev_geom.c
--- sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	9 May 2007 22:32:49 -0000	1.4
+++ sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	20 Oct 2007 05:14:12 -0000
@@ -207,7 +207,7 @@
 				ctx->gc_state = 2;
 				wakeup_one(&ctx->gc_state);
 				mtx_unlock(&ctx->gc_queue_mtx);
-				kthread_exit(0);
+				kproc_exit(0);
 			}
 			msleep(&ctx->gc_queue, &ctx->gc_queue_mtx,
 			    PRIBIO | PDROP, "vgeom:io", 0);
@@ -440,7 +440,7 @@
 
 	vd->vdev_tsd = ctx;
 
-	kthread_create(vdev_geom_worker, ctx, NULL, 0, 0, "vdev:worker %s",
+	kproc_create(vdev_geom_worker, ctx, NULL, 0, 0, "vdev:worker %s",
 	    pp->name);
 
 	return (0);
Index: sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c,v
retrieving revision 1.2
diff -d -u -r1.2 zvol.c
--- sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c	23 Apr 2007 00:52:07 -0000	1.2
+++ sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c	20 Oct 2007 05:14:12 -0000
@@ -359,7 +359,7 @@
 				zv->zv_state = 2;
 				wakeup(&zv->zv_state);
 				mtx_unlock(&zv->zv_queue_mtx);
-				kthread_exit(0);
+				kproc_exit(0);
 			}
 			msleep(&zv->zv_queue, &zv->zv_queue_mtx, PRIBIO | PDROP,
 			    "zvol:io", 0);
@@ -543,7 +543,7 @@
 	bioq_init(&zv->zv_queue);
 	mtx_init(&zv->zv_queue_mtx, "zvol", NULL, MTX_DEF);
 	zv->zv_state = 0;
-	kthread_create(zvol_worker, zv, NULL, 0, 0, "zvol:worker %s", pp->name);
+	kproc_create(zvol_worker, zv, NULL, 0, 0, "zvol:worker %s", pp->name);
 
 	zvol_minors++;
 end:
Index: sys/contrib/pf/net/pf.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/contrib/pf/net/pf.c,v
retrieving revision 1.46
diff -d -u -r1.46 pf.c
--- sys/contrib/pf/net/pf.c	23 Aug 2007 09:30:58 -0000	1.46
+++ sys/contrib/pf/net/pf.c	20 Oct 2007 05:14:12 -0000
@@ -988,7 +988,7 @@
 			sx_sunlock(&pf_consistency_lock);
 			PF_UNLOCK();
 			wakeup(pf_purge_thread);
-			kthread_exit(0);
+			kproc_exit(0);
 		}
 #endif
 		s = splsoftnet();
Index: sys/contrib/pf/net/pf_ioctl.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/contrib/pf/net/pf_ioctl.c,v
retrieving revision 1.28
diff -d -u -r1.28 pf_ioctl.c
--- sys/contrib/pf/net/pf_ioctl.c	3 Jul 2007 12:16:07 -0000	1.28
+++ sys/contrib/pf/net/pf_ioctl.c	20 Oct 2007 05:14:12 -0000
@@ -386,7 +386,7 @@
 	/* XXX do our best to avoid a conflict */
 	pf_status.hostid = arc4random();
 
-	if (kthread_create(pf_purge_thread, NULL, NULL, 0, 0, "pfpurge"))
+	if (kproc_create(pf_purge_thread, NULL, NULL, 0, 0, "pfpurge"))
 		return (ENXIO);
 
 	return (error);
@@ -464,13 +464,13 @@
 	pf_status.hostid = arc4random();
 
 	/* require process context to purge states, so perform in a thread */
-	kthread_create_deferred(pf_thread_create, NULL);
+	kproc_create_deferred(pf_thread_create, NULL);
 }
 
 void
 pf_thread_create(void *v)
 {
-	if (kthread_create(pf_purge_thread, NULL, NULL, "pfpurge"))
+	if (kproc_create(pf_purge_thread, NULL, NULL, "pfpurge"))
 		panic("pfpurge thread");
 }
 
Index: sys/dev/aac/aac.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/aac/aac.c,v
retrieving revision 1.121
diff -d -u -r1.121 aac.c
--- sys/dev/aac/aac.c	15 Oct 2007 17:34:58 -0000	1.121
+++ sys/dev/aac/aac.c	20 Oct 2007 05:14:12 -0000
@@ -354,7 +354,7 @@
 	sc->aac_dev_t->si_drv1 = sc;
 
 	/* Create the AIF thread */
-	if (kthread_create((void(*)(void *))aac_command_thread, sc,
+	if (kproc_create((void(*)(void *))aac_command_thread, sc,
 		   &sc->aifthread, 0, 0, "aac%daif", unit))
 		panic("Could not create AIF thread\n");
 
@@ -990,7 +990,7 @@
 	mtx_unlock(&sc->aac_io_lock);
 	wakeup(sc->aac_dev);
 
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 /*
Index: sys/dev/acpica/acpi_thermal.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/acpica/acpi_thermal.c,v
retrieving revision 1.64
diff -d -u -r1.64 acpi_thermal.c
--- sys/dev/acpica/acpi_thermal.c	5 Mar 2007 21:39:53 -0000	1.64
+++ sys/dev/acpica/acpi_thermal.c	20 Oct 2007 05:14:12 -0000
@@ -301,7 +301,7 @@
     sc->tz_event = EVENTHANDLER_REGISTER(power_profile_change,
 	acpi_tz_power_profile, sc, 0);
     if (acpi_tz_proc == NULL) {
-	error = kthread_create(acpi_tz_thread, NULL, &acpi_tz_proc,
+	error = kproc_create(acpi_tz_thread, NULL, &acpi_tz_proc,
 	    RFHIGHPID, 0, "acpi_thermal");
 	if (error != 0) {
 	    device_printf(sc->tz_dev, "could not create thread - %d", error);
@@ -1088,7 +1088,7 @@
     ACPI_LOCK(thermal);
     sc->tz_cooling_proc_running = FALSE;
     ACPI_UNLOCK(thermal);
-    kthread_exit(0);
+    kproc_exit(0);
 }
 
 /*
@@ -1121,7 +1121,7 @@
     if (sc->tz_cooling_proc == NULL) {
 	snprintf(name, sizeof(name), "acpi_cooling%d",
 	    device_get_unit(sc->tz_dev));
-	error = kthread_create(acpi_tz_cooling_thread, sc,
+	error = kproc_create(acpi_tz_cooling_thread, sc,
 	    &sc->tz_cooling_proc, RFHIGHPID, 0, name);
 	if (error != 0) {
 	    device_printf(sc->tz_dev, "could not create thread - %d", error);
Index: sys/dev/aic7xxx/aic_osm_lib.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/aic7xxx/aic_osm_lib.c,v
retrieving revision 1.6
diff -d -u -r1.6 aic_osm_lib.c
--- sys/dev/aic7xxx/aic_osm_lib.c	31 Jul 2007 20:11:03 -0000	1.6
+++ sys/dev/aic7xxx/aic_osm_lib.c	20 Oct 2007 05:14:12 -0000
@@ -125,7 +125,7 @@
 	aic->platform_data->recovery_thread = NULL;
 	wakeup(aic->platform_data);
 	aic_unlock(aic);
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 void
Index: sys/dev/aic7xxx/aic_osm_lib.h
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/aic7xxx/aic_osm_lib.h,v
retrieving revision 1.6
diff -d -u -r1.6 aic_osm_lib.h
--- sys/dev/aic7xxx/aic_osm_lib.h	17 Apr 2007 06:26:25 -0000	1.6
+++ sys/dev/aic7xxx/aic_osm_lib.h	20 Oct 2007 05:14:12 -0000
@@ -127,10 +127,10 @@
 /****************************** Kernel Threads ********************************/
 #if __FreeBSD_version > 500005
 #define	aic_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) \
-	kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
+	kproc_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
 #else
 #define	aic_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) \
-	kthread_create(func, farg, proc_ptr, fmtstr, arg)
+	kproc_create(func, farg, proc_ptr, fmtstr, arg)
 #endif
 
 /******************************* Bus Space/DMA ********************************/
Index: sys/dev/bktr/msp34xx.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/bktr/msp34xx.c,v
retrieving revision 1.5
diff -d -u -r1.5 msp34xx.c
--- sys/dev/bktr/msp34xx.c	16 Dec 2004 23:19:57 -0000	1.5
+++ sys/dev/bktr/msp34xx.c	20 Oct 2007 05:14:13 -0000
@@ -899,7 +899,7 @@
 	wakeup(&msp->kthread);
 	mtx_unlock(&Giant);
 
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 /* ----------------------------------------------------------------------- */
@@ -1126,7 +1126,7 @@
 	wakeup(&msp->kthread);
 	mtx_unlock(&Giant);
 
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 int msp_attach(bktr_ptr_t bktr)
@@ -1197,11 +1197,11 @@
 	}
 
 	/* startup control thread */
-	err = kthread_create(msp->simple ? msp3410d_thread : msp3400c_thread,
+	err = kproc_create(msp->simple ? msp3410d_thread : msp3400c_thread,
 			     bktr, &msp->kthread, (RFFDG | RFPROC), 0,
 			     msp->threaddesc);
 	if (err) {
-		printf("%s: Error returned by kthread_create: %d", bktr_name(bktr), err);
+		printf("%s: Error returned by kproc_create: %d", bktr_name(bktr), err);
 		free(msp->threaddesc, M_DEVBUF);
 		free(msp, M_DEVBUF);
 		bktr->msp3400c_info = NULL;
Index: sys/dev/ciss/ciss.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/ciss/ciss.c,v
retrieving revision 1.83
diff -d -u -r1.83 ciss.c
--- sys/dev/ciss/ciss.c	13 Oct 2007 05:45:45 -0000	1.83
+++ sys/dev/ciss/ciss.c	20 Oct 2007 05:14:13 -0000
@@ -3807,7 +3807,7 @@
 #if __FreeBSD_version >= 500000
     mtx_unlock(&sc->ciss_mtx);
 #endif
-    kthread_exit(0);
+    kproc_exit(0);
 }
 
 /************************************************************************
@@ -3818,11 +3818,11 @@
 {
 
 #if __FreeBSD_version > 500005
-    if (kthread_create((void(*)(void *))ciss_notify_thread, sc,
+    if (kproc_create((void(*)(void *))ciss_notify_thread, sc,
 		       &sc->ciss_notify_thread, 0, 0, "ciss_notify%d",
 		       device_get_unit(sc->ciss_dev)))
 #else
-    if (kthread_create((void(*)(void *))ciss_notify_thread, sc,
+    if (kproc_create((void(*)(void *))ciss_notify_thread, sc,
 		       &sc->ciss_notify_thread, "ciss_notify%d",
 		       device_get_unit(sc->ciss_dev)))
 #endif
Index: sys/dev/fdc/fdc.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/fdc/fdc.c,v
retrieving revision 1.317
diff -d -u -r1.317 fdc.c
--- sys/dev/fdc/fdc.c	27 Feb 2007 17:16:52 -0000	1.317
+++ sys/dev/fdc/fdc.c	20 Oct 2007 05:14:13 -0000
@@ -1207,7 +1207,7 @@
 	fdc->flags &= ~(FDC_KTHREAD_EXIT | FDC_KTHREAD_ALIVE);
 	mtx_unlock(&fdc->fdc_mtx);
 
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 /*
@@ -1795,7 +1795,7 @@
 	fdout_wr(fdc, fdc->fdout = 0);
 	bioq_init(&fdc->head);
 
-	kthread_create(fdc_thread, fdc, &fdc->fdc_thread, 0, 0,
+	kproc_create(fdc_thread, fdc, &fdc->fdc_thread, 0, 0,
 	    "fdc%d", device_get_unit(dev));
 
 	settle = hz / 8;
Index: sys/dev/firewire/firewire.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/firewire/firewire.c,v
retrieving revision 1.100
diff -d -u -r1.100 firewire.c
--- sys/dev/firewire/firewire.c	20 Jul 2007 03:42:57 -0000	1.100
+++ sys/dev/firewire/firewire.c	20 Oct 2007 05:14:13 -0000
@@ -440,7 +440,7 @@
 			(void *)firewire_watchdog, (void *)sc->fc);
 
 	/* create thread */
-	kthread_create(fw_bus_probe_thread, (void *)fc, &fc->probe_thread,
+	kproc_create(fw_bus_probe_thread, (void *)fc, &fc->probe_thread,
 		0, 0, "fw%d_probe", unit);
 
 	/* Locate our children */
@@ -1661,7 +1661,7 @@
 		msleep((void *)fc, &fc->wait_lock, PWAIT|PCATCH, "-", 0);
 	}
 	mtx_unlock(&fc->wait_lock);
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 /*
Index: sys/dev/flash/at45d.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/flash/at45d.c,v
retrieving revision 1.1
diff -d -u -r1.1 at45d.c
--- sys/dev/flash/at45d.c	29 Nov 2006 08:05:55 -0000	1.1
+++ sys/dev/flash/at45d.c	20 Oct 2007 05:14:13 -0000
@@ -181,7 +181,7 @@
 	sc->disk->d_unit = device_get_unit(sc->dev);
 	disk_create(sc->disk, DISK_VERSION);
 	bioq_init(&sc->bio_queue);
-	kthread_create(&at45d_task, sc, &sc->p, 0, 0, "task: at45d flash");
+	kproc_create(&at45d_task, sc, &sc->p, 0, 0, "task: at45d flash");
 
 	config_intrhook_disestablish(&sc->config_intrhook);
 }
Index: sys/dev/hptmv/entry.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/hptmv/entry.c,v
retrieving revision 1.17
diff -d -u -r1.17 entry.c
--- sys/dev/hptmv/entry.c	17 Jun 2007 05:55:50 -0000	1.17
+++ sys/dev/hptmv/entry.c	20 Oct 2007 05:14:13 -0000
@@ -2396,7 +2396,7 @@
 #endif
 */
 	#if (__FreeBSD_version >= 500043)
-		kthread_suspend_check(curproc);
+		kproc_suspend_check(curproc);
 	#else 
 		kproc_suspend_loop(curproc);
 	#endif
Index: sys/dev/hwpmc/hwpmc_logging.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/hwpmc/hwpmc_logging.c,v
retrieving revision 1.7
diff -d -u -r1.7 hwpmc_logging.c
--- sys/dev/hwpmc/hwpmc_logging.c	19 Apr 2007 08:02:51 -0000	1.7
+++ sys/dev/hwpmc/hwpmc_logging.c	20 Oct 2007 05:14:13 -0000
@@ -362,7 +362,7 @@
 
 	crfree(ownercred);
 
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 /*
@@ -566,7 +566,7 @@
 
 	/* mark process as owning a log file */
 	po->po_flags |= PMC_PO_OWNS_LOGFILE;
-	error = kthread_create(pmclog_loop, po, &po->po_kthread,
+	error = kproc_create(pmclog_loop, po, &po->po_kthread,
 	    RFHIGHPID, 0, "hwpmc: proc(%d)", p->p_pid);
 	if (error)
 		goto error;
Index: sys/dev/if_ndis/if_ndis.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/if_ndis/if_ndis.c,v
retrieving revision 1.124
diff -d -u -r1.124 if_ndis.c
--- sys/dev/if_ndis/if_ndis.c	26 Jul 2007 20:11:16 -0000	1.124
+++ sys/dev/if_ndis/if_ndis.c	20 Oct 2007 05:14:13 -0000
@@ -741,7 +741,7 @@
 #else
 		sc->ndis_tq = taskqueue_create("ndis_taskq", M_NOWAIT | M_ZERO,
 		    taskqueue_thread_enqueue, &sc->ndis_tq, &sc->sc_tqproc);
-		kthread_create(taskqueue_thread_loop, &sc->ndis_tq, &sc->sc_tqproc,
+		kproc_create(taskqueue_thread_loop, &sc->ndis_tq, &sc->sc_tqproc,
 		    0, 0, "%s taskq", device_get_nameunit(dev));
 #endif
 		TASK_INIT(&sc->ndis_scantask, 0, ndis_scan, sc);
Index: sys/dev/ipmi/ipmi_kcs.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/ipmi/ipmi_kcs.c,v
retrieving revision 1.1
diff -d -u -r1.1 ipmi_kcs.c
--- sys/dev/ipmi/ipmi_kcs.c	22 Sep 2006 22:11:29 -0000	1.1
+++ sys/dev/ipmi/ipmi_kcs.c	20 Oct 2007 05:14:13 -0000
@@ -466,14 +466,14 @@
 		ipmi_complete_request(sc, req);
 	}
 	IPMI_UNLOCK(sc);
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 static int
 kcs_startup(struct ipmi_softc *sc)
 {
 
-	return (kthread_create(kcs_loop, sc, &sc->ipmi_kthread, 0, 0, "%s: kcs",
+	return (kproc_create(kcs_loop, sc, &sc->ipmi_kthread, 0, 0, "%s: kcs",
 	    device_get_nameunit(sc->ipmi_dev)));
 }
 
Index: sys/dev/ipmi/ipmi_smic.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/ipmi/ipmi_smic.c,v
retrieving revision 1.4
diff -d -u -r1.4 ipmi_smic.c
--- sys/dev/ipmi/ipmi_smic.c	5 Oct 2006 15:38:59 -0000	1.4
+++ sys/dev/ipmi/ipmi_smic.c	20 Oct 2007 05:14:13 -0000
@@ -372,14 +372,14 @@
 		ipmi_complete_request(sc, req);
 	}
 	IPMI_UNLOCK(sc);
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 static int
 smic_startup(struct ipmi_softc *sc)
 {
 
-	return (kthread_create(smic_loop, sc, &sc->ipmi_kthread, 0, 0,
+	return (kproc_create(smic_loop, sc, &sc->ipmi_kthread, 0, 0,
 	    "%s: smic", device_get_nameunit(sc->ipmi_dev)));
 }
 
Index: sys/dev/ipmi/ipmi_ssif.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/ipmi/ipmi_ssif.c,v
retrieving revision 1.2
diff -d -u -r1.2 ipmi_ssif.c
--- sys/dev/ipmi/ipmi_ssif.c	27 Feb 2007 17:23:28 -0000	1.2
+++ sys/dev/ipmi/ipmi_ssif.c	20 Oct 2007 05:14:13 -0000
@@ -348,14 +348,14 @@
 		IPMI_LOCK(sc);
 	}
 	IPMI_UNLOCK(sc);
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 static int
 ssif_startup(struct ipmi_softc *sc)
 {
 
-	return (kthread_create(ssif_loop, sc, &sc->ipmi_kthread, 0, 0,
+	return (kproc_create(ssif_loop, sc, &sc->ipmi_kthread, 0, 0,
 	    "%s: ssif", device_get_nameunit(sc->ipmi_dev)));
 }
 
Index: sys/dev/iscsi/initiator/isc_sm.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/iscsi/initiator/isc_sm.c,v
retrieving revision 1.1
diff -d -u -r1.1 isc_sm.c
--- sys/dev/iscsi/initiator/isc_sm.c	24 Jul 2007 15:35:02 -0000	1.1
+++ sys/dev/iscsi/initiator/isc_sm.c	20 Oct 2007 05:14:13 -0000
@@ -587,7 +587,7 @@
      sdebug(3, "terminated");
 
      wakeup(sp);
-     kthread_exit(0);
+     kproc_exit(0);
 }
 
 #if 0
@@ -782,5 +782,5 @@
 
      sp->flags |= ISC_SM_RUN;
 
-     return kthread_create(ism_proc, sp, &sp->stp, 0, 0, "ism_%d", sp->sid);
+     return kproc_create(ism_proc, sp, &sp->stp, 0, 0, "ism_%d", sp->sid);
 }
Index: sys/dev/iscsi/initiator/isc_soc.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/iscsi/initiator/isc_soc.c,v
retrieving revision 1.1
diff -d -u -r1.1 isc_soc.c
--- sys/dev/iscsi/initiator/isc_soc.c	24 Jul 2007 15:35:02 -0000	1.1
+++ sys/dev/iscsi/initiator/isc_soc.c	20 Oct 2007 05:14:13 -0000
@@ -539,7 +539,7 @@
 
      mtx_unlock(&sp->io_mtx);
 
-     kthread_exit(0);
+     kproc_exit(0);
 }
 
 void
@@ -572,5 +572,5 @@
      debug_called(8);
 
      sp->flags |= ISC_CON_RUN;
-     kthread_create(isc_soc, sp, &sp->soc_proc, 0, 0, "iscsi%d", sp->sid);
+     kproc_create(isc_soc, sp, &sp->soc_proc, 0, 0, "iscsi%d", sp->sid);
 }
Index: sys/dev/isp/isp_freebsd.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/isp/isp_freebsd.c,v
retrieving revision 1.146
diff -d -u -r1.146 isp_freebsd.c
--- sys/dev/isp/isp_freebsd.c	23 Aug 2007 15:57:13 -0000	1.146
+++ sys/dev/isp/isp_freebsd.c	20 Oct 2007 05:14:13 -0000
@@ -251,11 +251,11 @@
 		isp_callout_init(&isp->isp_osinfo.gdt);
 		ISP_UNLOCK(isp);
 #if __FreeBSD_version >= 500000  
-		if (kthread_create(isp_kthread, isp, &isp->isp_osinfo.kproc,
+		if (kproc_create(isp_kthread, isp, &isp->isp_osinfo.kproc,
 		    RFHIGHPID, 0, "%s: fc_thrd",
 		    device_get_nameunit(isp->isp_dev)))
 #else
-		if (kthread_create(isp_kthread, isp, &isp->isp_osinfo.kproc,
+		if (kproc_create(isp_kthread, isp, &isp->isp_osinfo.kproc,
 		    "%s: fc_thrd", device_get_nameunit(isp->isp_dev)))
 #endif
 		{
Index: sys/dev/iwi/if_iwi.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/iwi/if_iwi.c,v
retrieving revision 1.57
diff -d -u -r1.57 if_iwi.c
--- sys/dev/iwi/if_iwi.c	5 Sep 2007 23:00:26 -0000	1.57
+++ sys/dev/iwi/if_iwi.c	20 Oct 2007 05:14:13 -0000
@@ -279,11 +279,11 @@
 #else
 	sc->sc_tq = taskqueue_create("iwi_taskq", M_NOWAIT | M_ZERO,
 		taskqueue_thread_enqueue, &sc->sc_tq, &sc->sc_tqproc);
-	kthread_create(taskqueue_thread_loop, &sc->sc_tq, &sc->sc_tqproc,
+	kproc_create(taskqueue_thread_loop, &sc->sc_tq, &sc->sc_tqproc,
 		0, 0, "%s taskq", device_get_nameunit(dev));
 	sc->sc_tq2 = taskqueue_create("iwi_taskq2", M_NOWAIT | M_ZERO,
 		taskqueue_thread_enqueue, &sc->sc_tq2, &sc->sc_tqproc);
-	kthread_create(taskqueue_thread_loop, &sc->sc_tq2, &sc->sc_tqproc,
+	kproc_create(taskqueue_thread_loop, &sc->sc_tq2, &sc->sc_tqproc,
 		0, 0, "%s taskq2", device_get_nameunit(dev));
 #endif
 	TASK_INIT(&sc->sc_radiontask, 0, iwi_radio_on, sc);
Index: sys/dev/md/md.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/md/md.c,v
retrieving revision 1.169
diff -d -u -r1.169 md.c
--- sys/dev/md/md.c	5 Jun 2007 00:00:51 -0000	1.169
+++ sys/dev/md/md.c	20 Oct 2007 05:14:13 -0000
@@ -701,7 +701,7 @@
 		if (sc->flags & MD_SHUTDOWN) {
 			sc->flags |= MD_EXITING;
 			mtx_unlock(&sc->queue_mtx);
-			kthread_exit(0);
+			kproc_exit(0);
 		}
 		bp = bioq_takefirst(&sc->bio_queue);
 		if (!bp) {
@@ -765,7 +765,7 @@
 	sc->unit = unit;
 	sprintf(sc->name, "md%d", unit);
 	LIST_INSERT_HEAD(&md_softc_list, sc, list);
-	error = kthread_create(md_kthread, sc, &sc->procp, 0, 0,"%s", sc->name);
+	error = kproc_create(md_kthread, sc, &sc->procp, 0, 0,"%s", sc->name);
 	if (error == 0)
 		return (sc);
 	LIST_REMOVE(sc, list);
Index: sys/dev/mmc/mmcsd.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/mmc/mmcsd.c,v
retrieving revision 1.3
diff -d -u -r1.3 mmcsd.c
--- sys/dev/mmc/mmcsd.c	26 May 2007 05:23:36 -0000	1.3
+++ sys/dev/mmc/mmcsd.c	20 Oct 2007 05:14:13 -0000
@@ -134,7 +134,7 @@
 	bioq_init(&sc->bio_queue);
 
 	sc->running = 1;
-	kthread_create(&mmcsd_task, sc, &sc->p, 0, 0, "task: mmc/sd card");
+	kproc_create(&mmcsd_task, sc, &sc->p, 0, 0, "task: mmc/sd card");
 
 	return (0);
 }
@@ -284,7 +284,7 @@
 	wakeup(sc);
 	MMCSD_UNLOCK(sc);
 
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 static device_method_t mmcsd_methods[] = {
Index: sys/dev/mpt/mpt.h
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/mpt/mpt.h,v
retrieving revision 1.42
diff -d -u -r1.42 mpt.h
--- sys/dev/mpt/mpt.h	14 Aug 2007 19:17:35 -0000	1.42
+++ sys/dev/mpt/mpt.h	20 Oct 2007 05:14:13 -0000
@@ -273,10 +273,10 @@
 /**************************** Kernel Thread Support ***************************/
 #if __FreeBSD_version > 500005
 #define mpt_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) \
-	kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
+	kproc_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
 #else
 #define mpt_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg) \
-	kthread_create(func, farg, proc_ptr, fmtstr, arg)
+	kproc_create(func, farg, proc_ptr, fmtstr, arg)
 #endif
 
 /****************************** Timer Facilities ******************************/
Index: sys/dev/mpt/mpt_cam.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/mpt/mpt_cam.c,v
retrieving revision 1.62
diff -d -u -r1.62 mpt_cam.c
--- sys/dev/mpt/mpt_cam.c	12 Oct 2007 16:54:51 -0000	1.62
+++ sys/dev/mpt/mpt_cam.c	20 Oct 2007 05:14:13 -0000
@@ -3988,7 +3988,7 @@
 	mpt->recovery_thread = NULL;
 	wakeup(&mpt->recovery_thread);
 	MPT_UNLOCK(mpt);
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 static int
Index: sys/dev/mpt/mpt_raid.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/mpt/mpt_raid.c,v
retrieving revision 1.15
diff -d -u -r1.15 mpt_raid.c
--- sys/dev/mpt/mpt_raid.c	5 May 2007 20:18:24 -0000	1.15
+++ sys/dev/mpt/mpt_raid.c	20 Oct 2007 05:14:13 -0000
@@ -722,7 +722,7 @@
 	mpt->raid_thread = NULL;
 	wakeup(&mpt->raid_thread);
 	MPT_UNLOCK(mpt);
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 #if 0
Index: sys/dev/ofw/ofw_disk.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/ofw/ofw_disk.c,v
retrieving revision 1.18
diff -d -u -r1.18 ofw_disk.c
--- sys/dev/ofw/ofw_disk.c	31 Oct 2005 03:09:38 -0000	1.18
+++ sys/dev/ofw/ofw_disk.c	20 Oct 2007 05:14:14 -0000
@@ -169,7 +169,7 @@
 	sc->ofwd_sectorsize = OFWD_BLOCKSIZE;
 	sc->ofwd_fwsectors = 0;
 	sc->ofwd_fwheads = 0;
-	error = kthread_create(ofwd_kthread, sc, &sc->ofwd_procp, 0, 0,
+	error = kproc_create(ofwd_kthread, sc, &sc->ofwd_procp, 0, 0,
 		     "ofwd0");
         if (error != 0) {
 		free(sc, M_DEVBUF);
Index: sys/dev/pccbb/pccbb.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/pccbb/pccbb.c,v
retrieving revision 1.165
diff -d -u -r1.165 pccbb.c
--- sys/dev/pccbb/pccbb.c	30 Sep 2007 11:05:15 -0000	1.165
+++ sys/dev/pccbb/pccbb.c	20 Oct 2007 05:14:14 -0000
@@ -332,11 +332,11 @@
 	cbb_set(sc, CBB_SOCKET_EVENT, 0xffffffff);
 
 	/*
-	 * Wait for the thread to die.  kthread_exit will do a wakeup
+	 * Wait for the thread to die.  kproc_exit will do a wakeup
 	 * on the event thread's struct thread * so that we know it is
 	 * safe to proceed.  IF the thread is running, set the please
 	 * die flag and wait for it to comply.  Since the wakeup on
-	 * the event thread happens only in kthread_exit, we don't
+	 * the event thread happens only in kproc_exit, we don't
 	 * need to loop here.
 	 */
 	bus_teardown_intr(brdev, sc->irq_res, sc->intrhand);
@@ -529,7 +529,7 @@
 	DEVPRINTF((sc->dev, "Thread terminating\n"));
 	sc->flags &= ~CBB_KTHREAD_RUNNING;
 	mtx_unlock(&sc->mtx);
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 /************************************************************************/
Index: sys/dev/pccbb/pccbb_pci.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/pccbb/pccbb_pci.c,v
retrieving revision 1.26
diff -d -u -r1.26 pccbb_pci.c
--- sys/dev/pccbb/pccbb_pci.c	30 Sep 2007 11:05:15 -0000	1.26
+++ sys/dev/pccbb/pccbb_pci.c	20 Oct 2007 05:14:14 -0000
@@ -434,7 +434,7 @@
 		cbb_print_config(brdev);
 
 	/* Start the thread */
-	if (kthread_create(cbb_event_thread, sc, &sc->event_thread, 0, 0,
+	if (kproc_create(cbb_event_thread, sc, &sc->event_thread, 0, 0,
 	    "%s event thread", device_get_nameunit(brdev))) {
 		device_printf(brdev, "unable to create event thread.\n");
 		panic("cbb_create_event_thread");
Index: sys/dev/random/harvest.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/random/harvest.c,v
retrieving revision 1.25
diff -d -u -r1.25 harvest.c
--- sys/dev/random/harvest.c	18 Oct 2004 19:29:13 -0000	1.25
+++ sys/dev/random/harvest.c	20 Oct 2007 05:14:14 -0000
@@ -120,7 +120,7 @@
 	return (count);
 }
 
-/* Helper routine to enable kthread_exit() to work while the module is
+/* Helper routine to enable kproc_exit() to work while the module is
  * being (or has been) unloaded.
  * This routine is in this file because it is always linked into the kernel,
  * and will thus never be unloaded. This is critical for unloadable modules
@@ -130,6 +130,6 @@
 random_set_wakeup_exit(void *control)
 {
 	wakeup(control);
-	kthread_exit(0);
+	kproc_exit(0);
 	/* NOTREACHED */
 }
Index: sys/dev/random/randomdev_soft.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/random/randomdev_soft.c,v
retrieving revision 1.15
diff -d -u -r1.15 randomdev_soft.c
--- sys/dev/random/randomdev_soft.c	28 May 2007 18:20:15 -0000	1.15
+++ sys/dev/random/randomdev_soft.c	20 Oct 2007 05:14:14 -0000
@@ -181,7 +181,7 @@
 	mtx_init(&harvest_mtx, "entropy harvest mutex", NULL, MTX_SPIN);
 
 	/* Start the hash/reseed thread */
-	error = kthread_create(random_kthread, NULL,
+	error = kproc_create(random_kthread, NULL,
 	    &random_kthread_proc, RFHIGHPID, 0, "yarrow");
 	if (error != 0)
 		panic("Cannot create entropy maintenance thread.");
Index: sys/dev/sound/midi/sequencer.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/sound/midi/sequencer.c,v
retrieving revision 1.26
diff -d -u -r1.26 sequencer.c
--- sys/dev/sound/midi/sequencer.c	15 Mar 2007 14:57:54 -0000	1.26
+++ sys/dev/sound/midi/sequencer.c	20 Oct 2007 05:14:14 -0000
@@ -461,7 +461,7 @@
 	mtx_unlock(&scp->seq_lock);
 	mtx_lock(&Giant);
 	SEQ_DEBUG(2, printf("seq_eventthread finished\n"));
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 /*
@@ -576,7 +576,7 @@
 	 * TODO: Add to list of sequencers this module provides
 	 */
 
-	ret = kthread_create(seq_eventthread, scp, NULL, RFHIGHPID, 0,
+	ret = kproc_create(seq_eventthread, scp, NULL, RFHIGHPID, 0,
 	    "sequencer %02d", scp->unit);
 
 	if (ret)
Index: sys/dev/usb/usb.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/usb/usb.c,v
retrieving revision 1.120
diff -d -u -r1.120 usb.c
--- sys/dev/usb/usb.c	20 Jun 2007 05:10:53 -0000	1.120
+++ sys/dev/usb/usb.c	20 Oct 2007 05:14:14 -0000
@@ -338,7 +338,7 @@
 	struct usb_taskq *taskq;
 	int i;
 
-	if (kthread_create(usb_event_thread, sc, &sc->sc_event_thread,
+	if (kproc_create(usb_event_thread, sc, &sc->sc_event_thread,
 	      RFHIGHPID, 0, device_get_nameunit(sc->sc_dev))) {
 		printf("%s: unable to create event thread for\n",
 		       device_get_nameunit(sc->sc_dev));
@@ -351,7 +351,7 @@
 			taskq->taskcreated = 1;
 			taskq->name = taskq_names[i];
 			TAILQ_INIT(&taskq->tasks);
-			if (kthread_create(usb_task_thread, taskq,
+			if (kproc_create(usb_task_thread, taskq,
 			    &taskq->task_thread_proc, RFHIGHPID, 0,
 			    taskq->name)) {
 				printf("unable to create task thread\n");
@@ -453,7 +453,7 @@
 	wakeup(sc);
 
 	DPRINTF(("usb_event_thread: exit\n"));
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 void
@@ -490,7 +490,7 @@
 	wakeup(&taskq->taskcreated);
 
 	DPRINTF(("usb_event_thread: exit\n"));
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 int
Index: sys/dev/usb/usb_port.h
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/usb/usb_port.h,v
retrieving revision 1.98
diff -d -u -r1.98 usb_port.h
--- sys/dev/usb/usb_port.h	6 Jul 2007 20:02:37 -0000	1.98
+++ sys/dev/usb/usb_port.h	20 Oct 2007 05:14:15 -0000
@@ -83,10 +83,10 @@
 #define uio_procp uio_td
 
 #define usb_kthread_create1(f, s, p, a0, a1) \
-		kthread_create((f), (s), (p), RFHIGHPID, 0, (a0), (a1))
+		kproc_create((f), (s), (p), RFHIGHPID, 0, (a0), (a1))
 #define usb_kthread_create2(f, s, p, a0) \
-		kthread_create((f), (s), (p), RFHIGHPID, 0, (a0))
-#define usb_kthread_create	kthread_create
+		kproc_create((f), (s), (p), RFHIGHPID, 0, (a0))
+#define usb_kthread_create	kproc_create
 
 #define	config_pending_incr()
 #define	config_pending_decr()
Index: sys/dev/utopia/utopia.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/dev/utopia/utopia.c,v
retrieving revision 1.11
diff -d -u -r1.11 utopia.c
--- sys/dev/utopia/utopia.c	22 Jun 2005 06:51:52 -0000	1.11
+++ sys/dev/utopia/utopia.c	20 Oct 2007 05:14:15 -0000
@@ -623,7 +623,7 @@
 	}
 	wakeup_one(&utopia_list);
 	UTP_RUNLOCK_LIST();
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 /*
@@ -639,7 +639,7 @@
 
 	  case MOD_LOAD:
 		mtx_init(&utopia_list_mtx, "utopia list mutex", NULL, MTX_DEF);
-		err = kthread_create(utopia_daemon, NULL, &utopia_kproc,
+		err = kproc_create(utopia_daemon, NULL, &utopia_kproc,
 		    RFHIGHPID, 0, "utopia");
 		if (err != 0) {
 			printf("cannot created utopia thread %d\n", err);
Index: sys/geom/bde/g_bde.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/geom/bde/g_bde.c,v
retrieving revision 1.29
diff -d -u -r1.29 g_bde.c
--- sys/geom/bde/g_bde.c	11 Mar 2005 15:42:51 -0000	1.29
+++ sys/geom/bde/g_bde.c	20 Oct 2007 05:14:15 -0000
@@ -183,7 +183,7 @@
 		TAILQ_INIT(&sc->worklist);
 		mtx_init(&sc->worklist_mutex, "g_bde_worklist", NULL, MTX_DEF);
 		/* XXX: error check */
-		kthread_create(g_bde_worker, gp, &sc->thread, 0, 0,
+		kproc_create(g_bde_worker, gp, &sc->thread, 0, 0,
 			"g_bde %s", gp->name);
 		pp = g_new_providerf(gp, gp->name);
 #if 0
Index: sys/geom/bde/g_bde_work.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/geom/bde/g_bde_work.c,v
retrieving revision 1.28
diff -d -u -r1.28 g_bde_work.c
--- sys/geom/bde/g_bde_work.c	4 Aug 2006 07:56:34 -0000	1.28
+++ sys/geom/bde/g_bde_work.c	20 Oct 2007 05:14:15 -0000
@@ -664,7 +664,7 @@
 	mtx_unlock(&sc->worklist_mutex);
 	sc->dead = 2;
 	wakeup(sc);
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 /*
Index: sys/geom/eli/g_eli.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/geom/eli/g_eli.c,v
retrieving revision 1.38
diff -d -u -r1.38 g_eli.c
--- sys/geom/eli/g_eli.c	5 Jun 2007 00:00:51 -0000	1.38
+++ sys/geom/eli/g_eli.c	20 Oct 2007 05:14:15 -0000
@@ -352,7 +352,7 @@
 				    curthread->td_proc->p_comm);
 				wakeup(&sc->sc_workers);
 				mtx_unlock(&sc->sc_queue_mtx);
-				kthread_exit(0);
+				kproc_exit(0);
 			}
 			msleep(sc, &sc->sc_queue_mtx, PRIBIO | PDROP,
 			    "geli:w", 0);
@@ -682,7 +682,7 @@
 			goto failed;
 		}
 
-		error = kthread_create(g_eli_worker, wr, &wr->w_proc, 0, 0,
+		error = kproc_create(g_eli_worker, wr, &wr->w_proc, 0, 0,
 		    "g_eli[%u] %s", i, bpp->name);
 		if (error != 0) {
 			crypto_freesession(wr->w_sid);
Index: sys/geom/journal/g_journal.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/geom/journal/g_journal.c,v
retrieving revision 1.13
diff -d -u -r1.13 g_journal.c
--- sys/geom/journal/g_journal.c	5 Jun 2007 00:00:52 -0000	1.13
+++ sys/geom/journal/g_journal.c	20 Oct 2007 05:14:15 -0000
@@ -2146,7 +2146,7 @@
 				sc->sc_worker = NULL;
 				wakeup(&sc->sc_worker);
 				mtx_unlock(&sc->sc_mtx);
-				kthread_exit(0);
+				kproc_exit(0);
 			}
 sleep:
 			g_journal_wait(sc, last_write);
@@ -2381,7 +2381,7 @@
 		callout_drain(&sc->sc_callout);
 	}
 
-	error = kthread_create(g_journal_worker, sc, &sc->sc_worker, 0, 0,
+	error = kproc_create(g_journal_worker, sc, &sc->sc_worker, 0, 0,
 	    "g_journal %s", sc->sc_name);
 	if (error != 0) {
 		GJ_DEBUG(0, "Cannot create worker thread for %s.journal.",
@@ -2766,7 +2766,7 @@
 	    g_journal_lowmem, mp, EVENTHANDLER_PRI_FIRST);
 	if (g_journal_event_lowmem == NULL)
 		GJ_DEBUG(0, "Warning! Cannot register lowmem event.");
-	error = kthread_create(g_journal_switcher, mp, NULL, 0, 0,
+	error = kproc_create(g_journal_switcher, mp, NULL, 0, 0,
 	    "g_journal switcher");
 	KASSERT(error == 0, ("Cannot create switcher thread."));
 }
@@ -3025,7 +3025,7 @@
 			g_journal_switcher_state = GJ_SWITCHER_DIED;
 			GJ_DEBUG(1, "Switcher exiting.");
 			wakeup(&g_journal_switcher_state);
-			kthread_exit(0);
+			kproc_exit(0);
 		}
 		if (error == 0 && g_journal_sync_requested == 0) {
 			GJ_DEBUG(1, "Out of cache, force switch (used=%u "
Index: sys/geom/mirror/g_mirror.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/geom/mirror/g_mirror.c,v
retrieving revision 1.93
diff -d -u -r1.93 g_mirror.c
--- sys/geom/mirror/g_mirror.c	5 Jun 2007 00:00:52 -0000	1.93
+++ sys/geom/mirror/g_mirror.c	20 Oct 2007 05:14:15 -0000
@@ -1815,7 +1815,7 @@
 				if (g_mirror_try_destroy(sc)) {
 					curthread->td_pflags &= ~TDP_GEOM;
 					G_MIRROR_DEBUG(1, "Thread exiting.");
-					kthread_exit(0);
+					kproc_exit(0);
 				}
 			}
 			G_MIRROR_DEBUG(5, "%s: I'm here 1.", __func__);
@@ -1839,7 +1839,7 @@
 				if (g_mirror_try_destroy(sc)) {
 					curthread->td_pflags &= ~TDP_GEOM;
 					G_MIRROR_DEBUG(1, "Thread exiting.");
-					kthread_exit(0);
+					kproc_exit(0);
 				}
 				mtx_lock(&sc->sc_queue_mtx);
 			}
@@ -2890,7 +2890,7 @@
 	gp->orphan = g_mirror_orphan;
 	sc->sc_sync.ds_geom = gp;
 	sc->sc_sync.ds_ndisks = 0;
-	error = kthread_create(g_mirror_worker, sc, &sc->sc_worker, 0, 0,
+	error = kproc_create(g_mirror_worker, sc, &sc->sc_worker, 0, 0,
 	    "g_mirror %s", md->md_name);
 	if (error != 0) {
 		G_MIRROR_DEBUG(1, "Cannot create kernel thread for %s.",
Index: sys/geom/multipath/g_multipath.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/geom/multipath/g_multipath.c,v
retrieving revision 1.1
diff -d -u -r1.1 g_multipath.c
--- sys/geom/multipath/g_multipath.c	27 Feb 2007 04:01:58 -0000	1.1
+++ sys/geom/multipath/g_multipath.c	20 Oct 2007 05:14:15 -0000
@@ -239,7 +239,7 @@
 	}
 	mtx_unlock(&gmtbq_mtx);
 	wakeup(&g_multipath_kt_state);
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 
@@ -421,7 +421,7 @@
 {
 	bioq_init(&gmtbq);
 	mtx_init(&gmtbq_mtx, "gmtbq", NULL, MTX_DEF);
-	if (kthread_create(g_multipath_kt, mp, NULL, 0, 0, "g_mp_kt") == 0) {
+	if (kproc_create(g_multipath_kt, mp, NULL, 0, 0, "g_mp_kt") == 0) {
 		g_multipath_kt_state = GKT_RUN;
 	}
 }
Index: sys/geom/raid3/g_raid3.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/geom/raid3/g_raid3.c,v
retrieving revision 1.81
diff -d -u -r1.81 g_raid3.c
--- sys/geom/raid3/g_raid3.c	5 Jun 2007 00:00:52 -0000	1.81
+++ sys/geom/raid3/g_raid3.c	20 Oct 2007 05:14:15 -0000
@@ -2064,7 +2064,7 @@
 				if (g_raid3_try_destroy(sc)) {
 					curthread->td_pflags &= ~TDP_GEOM;
 					G_RAID3_DEBUG(1, "Thread exiting.");
-					kthread_exit(0);
+					kproc_exit(0);
 				}
 			}
 			G_RAID3_DEBUG(5, "%s: I'm here 1.", __func__);
@@ -2088,7 +2088,7 @@
 				if (g_raid3_try_destroy(sc)) {
 					curthread->td_pflags &= ~TDP_GEOM;
 					G_RAID3_DEBUG(1, "Thread exiting.");
-					kthread_exit(0);
+					kproc_exit(0);
 				}
 				mtx_lock(&sc->sc_queue_mtx);
 			}
@@ -3170,7 +3170,7 @@
 		    sc->sc_zones[G_RAID3_ZONE_4K].sz_failed = 0;
 	}
 
-	error = kthread_create(g_raid3_worker, sc, &sc->sc_worker, 0, 0,
+	error = kproc_create(g_raid3_worker, sc, &sc->sc_worker, 0, 0,
 	    "g_raid3 %s", md->md_name);
 	if (error != 0) {
 		G_RAID3_DEBUG(1, "Cannot create kernel thread for %s.",
Index: sys/geom/vinum/geom_vinum_drive.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/geom/vinum/geom_vinum_drive.c,v
retrieving revision 1.25
diff -d -u -r1.25 geom_vinum_drive.c
--- sys/geom/vinum/geom_vinum_drive.c	6 Jan 2006 18:03:17 -0000	1.25
+++ sys/geom/vinum/geom_vinum_drive.c	20 Oct 2007 05:14:15 -0000
@@ -80,7 +80,7 @@
 	d->bqueue = g_malloc(sizeof(struct bio_queue_head), M_WAITOK | M_ZERO);
 	bioq_init(d->bqueue);
 	mtx_init(&d->bqueue_mtx, "gv_drive", NULL, MTX_DEF);
-	kthread_create(gv_drive_worker, d, NULL, 0, 0, "gv_d %s", d->name);
+	kproc_create(gv_drive_worker, d, NULL, 0, 0, "gv_d %s", d->name);
 	d->flags |= GV_DRIVE_THREAD_ACTIVE;
 }
 
@@ -373,7 +373,7 @@
 	mtx_unlock(&d->bqueue_mtx);
 	d->flags |= GV_DRIVE_THREAD_DEAD;
 
-	kthread_exit(ENXIO);
+	kproc_exit(ENXIO);
 }
 
 
@@ -509,7 +509,7 @@
 			mtx_init(&d->bqueue_mtx, "gv_drive", NULL, MTX_DEF);
 
 		if (!(d->flags & GV_DRIVE_THREAD_ACTIVE)) {
-			kthread_create(gv_drive_worker, d, NULL, 0, 0,
+			kproc_create(gv_drive_worker, d, NULL, 0, 0,
 			    "gv_d %s", d->name);
 			d->flags |= GV_DRIVE_THREAD_ACTIVE;
 		}
Index: sys/geom/vinum/geom_vinum_init.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/geom/vinum/geom_vinum_init.c,v
retrieving revision 1.11
diff -d -u -r1.11 geom_vinum_init.c
--- sys/geom/vinum/geom_vinum_init.c	28 Aug 2005 18:16:31 -0000	1.11
+++ sys/geom/vinum/geom_vinum_init.c	20 Oct 2007 05:14:15 -0000
@@ -348,7 +348,7 @@
 		sync->from = up;
 		sync->to = p;
 		sync->syncsize = GV_DFLT_SYNCSIZE;
-		kthread_create(gv_sync_td, sync, NULL, 0, 0, "gv_sync '%s'",
+		kproc_create(gv_sync_td, sync, NULL, 0, 0, "gv_sync '%s'",
 		    p->name);
 	}
 
@@ -371,7 +371,7 @@
 	sync->to = p;
 	sync->syncsize = GV_DFLT_SYNCSIZE;
 
-	kthread_create(gv_rebuild_td, sync, NULL, 0, 0, "gv_rebuild %s",
+	kproc_create(gv_rebuild_td, sync, NULL, 0, 0, "gv_rebuild %s",
 	    p->name);
 
 	return (0);
@@ -389,7 +389,7 @@
 			return (EINPROGRESS);
 		gv_set_sd_state(s, GV_SD_INITIALIZING, GV_SETSTATE_FORCE);
 		s->init_size = GV_DFLT_SYNCSIZE;
-		kthread_create(gv_init_td, s, NULL, 0, 0, "gv_init %s",
+		kproc_create(gv_init_td, s, NULL, 0, 0, "gv_init %s",
 		    s->name);
 	}
 
@@ -422,7 +422,7 @@
 		g_topology_unlock();
 		printf("GEOM_VINUM: rebuild of %s failed to access consumer: "
 		    "%d\n", p->name, error);
-		kthread_exit(error);
+		kproc_exit(error);
 	}
 	g_topology_unlock();
 
@@ -480,7 +480,7 @@
 		printf("GEOM_VINUM: rebuild of %s finished\n", p->name);
 
 	g_free(sync);
-	kthread_exit(error);
+	kproc_exit(error);
 }
 
 void
@@ -511,7 +511,7 @@
 		printf("GEOM_VINUM: sync from '%s' failed to access "
 		    "consumer: %d\n", sync->from->name, error);
 		g_free(sync);
-		kthread_exit(error);
+		kproc_exit(error);
 	}
 	error = g_access(to, 0, 1, 0);
 	if (error) {
@@ -520,7 +520,7 @@
 		printf("GEOM_VINUM: sync to '%s' failed to access "
 		    "consumer: %d\n", p->name, error);
 		g_free(sync);
-		kthread_exit(error);
+		kproc_exit(error);
 	}
 	g_topology_unlock();
 
@@ -593,7 +593,7 @@
 	p->synced = 0;
 
 	g_free(sync);
-	kthread_exit(error);
+	kproc_exit(error);
 }
 
 void
@@ -632,7 +632,7 @@
 		g_topology_unlock();
 		printf("GEOM_VINUM: subdisk '%s' init: failed to access "
 		    "consumer; error: %d\n", s->name, error);
-		kthread_exit(error);
+		kproc_exit(error);
 	}
 	g_topology_unlock();
 
@@ -667,5 +667,5 @@
 		printf("GEOM_VINUM: subdisk '%s' init: finished successfully\n",
 		    s->name);
 	}
-	kthread_exit(error);
+	kproc_exit(error);
 }
Index: sys/geom/vinum/geom_vinum_plex.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/geom/vinum/geom_vinum_plex.c,v
retrieving revision 1.17
diff -d -u -r1.17 geom_vinum_plex.c
--- sys/geom/vinum/geom_vinum_plex.c	6 Jan 2006 18:03:17 -0000	1.17
+++ sys/geom/vinum/geom_vinum_plex.c	20 Oct 2007 05:14:15 -0000
@@ -332,7 +332,7 @@
 	p->flags |= GV_PLEX_THREAD_DEAD;
 	wakeup(p);
 
-	kthread_exit(ENXIO);
+	kproc_exit(ENXIO);
 }
 
 static int
@@ -783,7 +783,7 @@
 		if (mtx_initialized(&p->bqueue_mtx) == 0)
 			mtx_init(&p->bqueue_mtx, "gv_plex", NULL, MTX_DEF);
 		if (!(p->flags & GV_PLEX_THREAD_ACTIVE)) {
-			kthread_create(gv_plex_worker, p, NULL, 0, 0, "gv_p %s",
+			kproc_create(gv_plex_worker, p, NULL, 0, 0, "gv_p %s",
 			    p->name);
 			p->flags |= GV_PLEX_THREAD_ACTIVE;
 		}
@@ -807,7 +807,7 @@
 		    M_WAITOK | M_ZERO);
 		bioq_init(p->wqueue);
 		mtx_init(&p->bqueue_mtx, "gv_plex", NULL, MTX_DEF);
-		kthread_create(gv_plex_worker, p, NULL, 0, 0, "gv_p %s",
+		kproc_create(gv_plex_worker, p, NULL, 0, 0, "gv_p %s",
 		    p->name);
 		p->flags |= GV_PLEX_THREAD_ACTIVE;
 
Index: sys/geom/vinum/geom_vinum_volume.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/geom/vinum/geom_vinum_volume.c,v
retrieving revision 1.11
diff -d -u -r1.11 geom_vinum_volume.c
--- sys/geom/vinum/geom_vinum_volume.c	6 Jan 2006 18:03:17 -0000	1.11
+++ sys/geom/vinum/geom_vinum_volume.c	20 Oct 2007 05:14:15 -0000
@@ -149,7 +149,7 @@
 	v->flags |= GV_VOL_THREAD_DEAD;
 	wakeup(v);
 
-	kthread_exit(ENXIO);
+	kproc_exit(ENXIO);
 }
 
 static void
@@ -369,7 +369,7 @@
 		mtx_init(&v->bqueue_mtx, "gv_plex", NULL, MTX_DEF);
 
 	if (!(v->flags & GV_VOL_THREAD_ACTIVE)) {
-		kthread_create(gv_vol_worker, v, NULL, 0, 0, "gv_v %s",
+		kproc_create(gv_vol_worker, v, NULL, 0, 0, "gv_v %s",
 		    v->name);
 		v->flags |= GV_VOL_THREAD_ACTIVE;
 	}
Index: sys/i386/bios/apm.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/i386/bios/apm.c,v
retrieving revision 1.147
diff -d -u -r1.147 apm.c
--- sys/i386/bios/apm.c	2 Oct 2006 12:59:56 -0000	1.147
+++ sys/i386/bios/apm.c	20 Oct 2007 05:14:15 -0000
@@ -754,7 +754,7 @@
 		mtx_unlock(&sc->mtx);
 	}
 	sc->running = 0;
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 /* enable APM BIOS */
@@ -770,7 +770,7 @@
 
 	/* Start the thread */
 	sc->active = 1;
-	if (kthread_create(apm_event_thread, sc, &sc->event_thread, 0, 0,
+	if (kproc_create(apm_event_thread, sc, &sc->event_thread, 0, 0,
 	    "apm worker"))
 		panic("Cannot create apm worker thread");
 
Index: sys/kern/init_main.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/kern/init_main.c,v
retrieving revision 1.283
diff -d -u -r1.283 init_main.c
--- sys/kern/init_main.c	17 Sep 2007 05:27:20 -0000	1.283
+++ sys/kern/init_main.c	20 Oct 2007 05:14:16 -0000
@@ -691,7 +691,7 @@
 }
 
 /*
- * Like kthread_create(), but runs in it's own address space.
+ * Like kproc_create(), but runs in it's own address space.
  * We do this early to reserve pid 1.
  *
  * Note special case - do not make it runnable yet.  Other work
Index: sys/kern/kern_acct.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/kern/kern_acct.c,v
retrieving revision 1.95
diff -d -u -r1.95 kern_acct.c
--- sys/kern/kern_acct.c	31 Aug 2007 13:56:26 -0000	1.95
+++ sys/kern/kern_acct.c	20 Oct 2007 05:14:16 -0000
@@ -283,7 +283,7 @@
 		 * than one, but if so the extras will commit suicide as
 		 * soon as they start up.
 		 */
-		error = kthread_create(acct_thread, NULL, NULL, 0, 0,
+		error = kproc_create(acct_thread, NULL, NULL, 0, 0,
 		    "accounting");
 		if (error) {
 			vfslocked = VFS_LOCK_GIANT(acct_vp->v_mount);
@@ -625,7 +625,7 @@
 	sx_xlock(&acct_sx);
 	if (acct_state & ACCT_RUNNING) {
 		sx_xunlock(&acct_sx);
-		kthread_exit(0);
+		kproc_exit(0);
 	}
 	acct_state |= ACCT_RUNNING;
 
@@ -652,5 +652,5 @@
 	 */
 	acct_state = 0;
 	sx_xunlock(&acct_sx);
-	kthread_exit(0);
+	kproc_exit(0);
 }
Index: sys/kern/kern_fork.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/kern/kern_fork.c,v
retrieving revision 1.282
diff -d -u -r1.282 kern_fork.c
--- sys/kern/kern_fork.c	21 Sep 2007 04:10:23 -0000	1.282
+++ sys/kern/kern_fork.c	20 Oct 2007 05:14:16 -0000
@@ -802,7 +802,7 @@
 	if (p->p_flag & P_KTHREAD) {
 		printf("Kernel thread \"%s\" (pid %d) exited prematurely.\n",
 		    p->p_comm, p->p_pid);
-		kthread_exit(0);
+		kproc_exit(0);
 	}
 	mtx_assert(&Giant, MA_NOTOWNED);
 
Index: sys/kern/kern_idle.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/kern/kern_idle.c,v
retrieving revision 1.48
diff -d -u -r1.48 kern_idle.c
--- sys/kern/kern_idle.c	5 Jun 2007 00:00:53 -0000	1.48
+++ sys/kern/kern_idle.c	20 Oct 2007 05:14:16 -0000
@@ -60,16 +60,16 @@
 
 #ifdef SMP
 	SLIST_FOREACH(pc, &cpuhead, pc_allcpu) {
-		error = kthread_create(sched_idletd, NULL, &p,
+		error = kproc_create(sched_idletd, NULL, &p,
 		    RFSTOPPED | RFHIGHPID, 0, "idle: cpu%d", pc->pc_cpuid);
 		pc->pc_idlethread = FIRST_THREAD_IN_PROC(p);
 #else
-		error = kthread_create(sched_idletd, NULL, &p,
+		error = kproc_create(sched_idletd, NULL, &p,
 		    RFSTOPPED | RFHIGHPID, 0, "idle");
 		PCPU_SET(idlethread, FIRST_THREAD_IN_PROC(p));
 #endif
 		if (error)
-			panic("idle_setup: kthread_create error %d\n", error);
+			panic("idle_setup: kproc_create error %d\n", error);
 
 		PROC_LOCK(p);
 		p->p_flag |= P_NOLOAD;
Index: sys/kern/kern_intr.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/kern/kern_intr.c,v
retrieving revision 1.147
diff -d -u -r1.147 kern_intr.c
--- sys/kern/kern_intr.c	5 Jun 2007 00:00:54 -0000	1.147
+++ sys/kern/kern_intr.c	20 Oct 2007 05:14:16 -0000
@@ -337,10 +337,10 @@
 
 	ithd = malloc(sizeof(struct intr_thread), M_ITHREAD, M_WAITOK | M_ZERO);
 
-	error = kthread_create(ithread_loop, ithd, &p, RFSTOPPED | RFHIGHPID,
+	error = kproc_create(ithread_loop, ithd, &p, RFSTOPPED | RFHIGHPID,
 	    0, "%s", name);
 	if (error)
-		panic("kthread_create() failed with %d", error);
+		panic("kproc_create() failed with %d", error);
 	td = FIRST_THREAD_IN_PROC(p);	/* XXXKSE */
 	thread_lock(td);
 	sched_class(td, PRI_ITHD);
@@ -362,10 +362,10 @@
 
 	ithd = malloc(sizeof(struct intr_thread), M_ITHREAD, M_WAITOK | M_ZERO);
 
-	error = kthread_create(ithread_loop, ih, &p, RFSTOPPED | RFHIGHPID,
+	error = kproc_create(ithread_loop, ih, &p, RFSTOPPED | RFHIGHPID,
 	    0, "%s", name);
 	if (error)
-		panic("kthread_create() failed with %d", error);
+		panic("kproc_create() failed with %d", error);
 	td = FIRST_THREAD_IN_PROC(p);	/* XXXKSE */
 	thread_lock(td);
 	sched_class(td, PRI_ITHD);
@@ -1102,7 +1102,7 @@
 			CTR3(KTR_INTR, "%s: pid %d (%s) exiting", __func__,
 			    p->p_pid, p->p_comm);
 			free(ithd, M_ITHREAD);
-			kthread_exit(0);
+			kproc_exit(0);
 		}
 
 		/*
@@ -1173,7 +1173,7 @@
 			CTR3(KTR_INTR, "%s: pid %d (%s) exiting", __func__,
 			    p->p_pid, p->p_comm);
 			free(ithd, M_ITHREAD);
-			kthread_exit(0);
+			kproc_exit(0);
 		}
 
 		/*
Index: sys/kern/kern_kthread.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/kern/kern_kthread.c,v
retrieving revision 1.38
diff -d -u -r1.38 kern_kthread.c
--- sys/kern/kern_kthread.c	5 Jun 2007 00:00:54 -0000	1.38
+++ sys/kern/kern_kthread.c	20 Oct 2007 05:14:16 -0000
@@ -56,7 +56,7 @@
 	const struct kproc_desc	*kp = udata;
 	int error;
 
-	error = kthread_create((void (*)(void *))kp->func, NULL,
+	error = kproc_create((void (*)(void *))kp->func, NULL,
 		    kp->global_procpp, 0, 0, "%s", kp->arg0);
 	if (error)
 		panic("kproc_start: %s: error %d", kp->arg0, error);
@@ -73,7 +73,7 @@
  * fmt and following will be *printf'd into (*newpp)->p_comm (for ps, etc.).
  */
 int
-kthread_create(void (*func)(void *), void *arg,
+kproc_create(void (*func)(void *), void *arg,
     struct proc **newpp, int flags, int pages, const char *fmt, ...)
 {
 	int error;
@@ -82,7 +82,7 @@
 	struct proc *p2;
 
 	if (!proc0.p_stats)
-		panic("kthread_create called too soon");
+		panic("kproc_create called too soon");
 
 	error = fork1(&thread0, RFMEM | RFFDG | RFPROC | RFSTOPPED | flags,
 	    pages, &p2);
@@ -122,7 +122,7 @@
 }
 
 void
-kthread_exit(int ecode)
+kproc_exit(int ecode)
 {
 	struct thread *td;
 	struct proc *p;
@@ -154,7 +154,7 @@
  * Participation is voluntary.
  */
 int
-kthread_suspend(struct proc *p, int timo)
+kproc_suspend(struct proc *p, int timo)
 {
 	/*
 	 * Make sure this is indeed a system process and we can safely
@@ -171,7 +171,7 @@
 }
 
 int
-kthread_resume(struct proc *p)
+kproc_resume(struct proc *p)
 {
 	/*
 	 * Make sure this is indeed a system process and we can safely
@@ -189,7 +189,7 @@
 }
 
 void
-kthread_suspend_check(struct proc *p)
+kproc_suspend_check(struct proc *p)
 {
 	PROC_LOCK(p);
 	while (SIGISMEMBER(p->p_siglist, SIGSTOP)) {
Index: sys/kern/kern_shutdown.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/kern/kern_shutdown.c,v
retrieving revision 1.182
diff -d -u -r1.182 kern_shutdown.c
--- sys/kern/kern_shutdown.c	5 Jun 2007 00:00:54 -0000	1.182
+++ sys/kern/kern_shutdown.c	20 Oct 2007 05:14:16 -0000
@@ -608,7 +608,7 @@
 	strlcpy(procname, p->p_comm, sizeof(procname));
 	printf("Waiting (max %d seconds) for system process `%s' to stop...",
 	    kproc_shutdown_wait, procname);
-	error = kthread_suspend(p, kproc_shutdown_wait * hz);
+	error = kproc_suspend(p, kproc_shutdown_wait * hz);
 
 	if (error == EWOULDBLOCK)
 		printf("timed out\n");
Index: sys/kern/subr_taskqueue.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/kern/subr_taskqueue.c,v
retrieving revision 1.39
diff -d -u -r1.39 subr_taskqueue.c
--- sys/kern/subr_taskqueue.c	5 Jun 2007 00:00:54 -0000	1.39
+++ sys/kern/subr_taskqueue.c	20 Oct 2007 05:14:16 -0000
@@ -336,14 +336,14 @@
 
 	for (i = 0; i < count; i++) {
 		if (count == 1)
-			error = kthread_create(taskqueue_thread_loop, tqp,
+			error = kproc_create(taskqueue_thread_loop, tqp,
 			    &tq->tq_pproc[i], RFSTOPPED, 0, ktname);
 		else
-			error = kthread_create(taskqueue_thread_loop, tqp,
+			error = kproc_create(taskqueue_thread_loop, tqp,
 			    &tq->tq_pproc[i], RFSTOPPED, 0, "%s_%d", ktname, i);
 		if (error) {
 			/* should be ok to continue, taskqueue_free will dtrt */
-			printf("%s: kthread_create(%s): error %d",
+			printf("%s: kproc_create(%s): error %d",
 				__func__, ktname, error);
 			tq->tq_pproc[i] = NULL;		/* paranoid */
 		} else
@@ -379,7 +379,7 @@
 	tq->tq_pcount--;
 	wakeup_one(tq->tq_pproc);
 	TQ_UNLOCK(tq);
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 void
Index: sys/kern/vfs_aio.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/kern/vfs_aio.c,v
retrieving revision 1.233
diff -d -u -r1.233 vfs_aio.c
--- sys/kern/vfs_aio.c	20 Aug 2007 11:53:26 -0000	1.233
+++ sys/kern/vfs_aio.c	20 Oct 2007 05:14:16 -0000
@@ -1122,7 +1122,7 @@
 						    mycp->p_vmspace->vm_refcnt);
 					}
 #endif
-					kthread_exit(0);
+					kproc_exit(0);
 				}
 			}
 		}
@@ -1143,7 +1143,7 @@
 	int id;
 
 	id = alloc_unr(aiod_unr);
-	error = kthread_create(aio_daemon, (void *)(intptr_t)id, &p,
+	error = kproc_create(aio_daemon, (void *)(intptr_t)id, &p,
 		RFNOWAIT, 0, "aiod%d", id);
 	if (error == 0) {
 		/*
Index: sys/kern/vfs_bio.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/kern/vfs_bio.c,v
retrieving revision 1.528
diff -d -u -r1.528 vfs_bio.c
--- sys/kern/vfs_bio.c	26 Sep 2007 11:22:23 -0000	1.528
+++ sys/kern/vfs_bio.c	20 Oct 2007 05:14:16 -0000
@@ -2058,7 +2058,7 @@
 		bd_request = 0;
 		mtx_unlock(&bdlock);
 
-		kthread_suspend_check(bufdaemonproc);
+		kproc_suspend_check(bufdaemonproc);
 
 		/*
 		 * Do the flush.  Limit the amount of in-transit I/O we
Index: sys/kern/vfs_subr.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/kern/vfs_subr.c,v
retrieving revision 1.707
diff -d -u -r1.707 vfs_subr.c
--- sys/kern/vfs_subr.c	12 Sep 2007 16:31:32 -0000	1.707
+++ sys/kern/vfs_subr.c	20 Oct 2007 05:14:16 -0000
@@ -726,7 +726,7 @@
 	    SHUTDOWN_PRI_FIRST);
 
 	for (;;) {
-		kthread_suspend_check(p);
+		kproc_suspend_check(p);
 		mtx_lock(&vnode_free_list_mtx);
 		if (freevnodes > wantfreevnodes)
 			vnlru_free(freevnodes - wantfreevnodes);
@@ -1688,7 +1688,7 @@
 		if (syncer_state == SYNCER_FINAL_DELAY &&
 		    syncer_final_iter == 0) {
 			mtx_unlock(&sync_mtx);
-			kthread_suspend_check(td->td_proc);
+			kproc_suspend_check(td->td_proc);
 			mtx_lock(&sync_mtx);
 		}
 		net_worklist_len = syncer_worklist_len - sync_vnode_count;
Index: sys/netinet/sctp_bsd_addr.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/netinet/sctp_bsd_addr.c,v
retrieving revision 1.14
diff -d -u -r1.14 sctp_bsd_addr.c
--- sys/netinet/sctp_bsd_addr.c	8 Sep 2007 17:48:45 -0000	1.14
+++ sys/netinet/sctp_bsd_addr.c	20 Oct 2007 05:14:19 -0000
@@ -106,7 +106,7 @@
 {
 	int ret;
 
-	ret = kthread_create(sctp_iterator_thread,
+	ret = kproc_create(sctp_iterator_thread,
 	    (void *)NULL,
 	    &sctppcbinfo.thread_proc,
 	    RFPROC,
Index: sys/netsmb/smb_iod.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/netsmb/smb_iod.c,v
retrieving revision 1.17
diff -d -u -r1.17 smb_iod.c
--- sys/netsmb/smb_iod.c	22 Aug 2006 03:05:51 -0000	1.17
+++ sys/netsmb/smb_iod.c	20 Oct 2007 05:14:19 -0000
@@ -668,7 +668,7 @@
 		tsleep(&iod->iod_flags, PWAIT, "90idle", iod->iod_sleeptimo);
 	}
 /*	mtx_lock(&Giant, MTX_DEF);*/
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 int
@@ -689,7 +689,7 @@
 	TAILQ_INIT(&iod->iod_rqlist);
 	smb_sl_init(&iod->iod_evlock, "90evl");
 	STAILQ_INIT(&iod->iod_evlist);
-	error = kthread_create(smb_iod_thread, iod, &iod->iod_p,
+	error = kproc_create(smb_iod_thread, iod, &iod->iod_p,
 	    RFNOWAIT, 0, "smbiod%d", iod->iod_id);
 	if (error) {
 		SMBERROR("can't start smbiod: %d", error);
Index: sys/nfs4client/nfs4_vfsops.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/nfs4client/nfs4_vfsops.c,v
retrieving revision 1.28
diff -d -u -r1.28 nfs4_vfsops.c
--- sys/nfs4client/nfs4_vfsops.c	16 Oct 2007 10:54:55 -0000	1.28
+++ sys/nfs4client/nfs4_vfsops.c	20 Oct 2007 05:14:19 -0000
@@ -526,7 +526,7 @@
 			nfs4_daemonproc = NULL;
 			mtx_unlock(&Giant);
 			/*printf("nfsv4 renewd exiting\n");*/
-			kthread_exit(0);
+			kproc_exit(0);
 		}
 		tsleep(&nfs4_daemonproc, PVFS, "nfs4", 2 * hz);
 	}
@@ -644,7 +644,7 @@
 
 	/* Start renewd if it isn't already running */
 	if (nfs4_daemonproc == NULL)
-		kthread_create(nfs4_daemon, crdup(cred), &nfs4_daemonproc,
+		kproc_create(nfs4_daemon, crdup(cred), &nfs4_daemonproc,
 			       (RFPROC|RFMEM), 0, "nfs4rd");
 
 	return (0);
Index: sys/nfsclient/nfs_nfsiod.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/nfsclient/nfs_nfsiod.c,v
retrieving revision 1.91
diff -d -u -r1.91 nfs_nfsiod.c
--- sys/nfsclient/nfs_nfsiod.c	25 Sep 2007 21:08:49 -0000	1.91
+++ sys/nfsclient/nfs_nfsiod.c	20 Oct 2007 05:14:19 -0000
@@ -177,7 +177,7 @@
 	if (newiod == -1)
 		return (-1);
 	mtx_unlock(&nfs_iod_mtx);
-	error = kthread_create(nfssvc_iod, nfs_asyncdaemon + i, NULL, RFHIGHPID,
+	error = kproc_create(nfssvc_iod, nfs_asyncdaemon + i, NULL, RFHIGHPID,
 	    0, "nfsiod %d", newiod);
 	mtx_lock(&nfs_iod_mtx);
 	if (error)
@@ -309,7 +309,7 @@
 		wakeup(&nfs_numasync);
 	mtx_unlock(&nfs_iod_mtx);
 	if ((error == 0) || (error == EWOULDBLOCK))
-		kthread_exit(0);
+		kproc_exit(0);
 	/* Abnormal termination */
-	kthread_exit(1);
+	kproc_exit(1);
 }
Index: sys/opencrypto/crypto.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/opencrypto/crypto.c,v
retrieving revision 1.27
diff -d -u -r1.27 crypto.c
--- sys/opencrypto/crypto.c	21 Mar 2007 03:42:51 -0000	1.27
+++ sys/opencrypto/crypto.c	20 Oct 2007 05:14:19 -0000
@@ -216,7 +216,7 @@
 		goto bad;
 	}
 
-	error = kthread_create((void (*)(void *)) crypto_proc, NULL,
+	error = kproc_create((void (*)(void *)) crypto_proc, NULL,
 		    &cryptoproc, 0, 0, "crypto");
 	if (error) {
 		printf("crypto_init: cannot start crypto thread; error %d",
@@ -224,7 +224,7 @@
 		goto bad;
 	}
 
-	error = kthread_create((void (*)(void *)) crypto_ret_proc, NULL,
+	error = kproc_create((void (*)(void *)) crypto_ret_proc, NULL,
 		    &cryptoretproc, 0, 0, "crypto returns");
 	if (error) {
 		printf("crypto_init: cannot start cryptoret thread; error %d",
@@ -1222,7 +1222,7 @@
 	CRYPTO_DRIVER_LOCK();
 	wakeup_one(chan);
 	CRYPTO_DRIVER_UNLOCK();
-	kthread_exit(0);
+	kproc_exit(0);
 }
 
 /*
Index: sys/security/audit/audit_worker.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/security/audit/audit_worker.c,v
retrieving revision 1.16
diff -d -u -r1.16 audit_worker.c
--- sys/security/audit/audit_worker.c	1 Jun 2007 21:58:59 -0000	1.16
+++ sys/security/audit/audit_worker.c	20 Oct 2007 05:14:19 -0000
@@ -544,8 +544,8 @@
 	int error;
 
 	cv_init(&audit_replacement_cv, "audit_replacement_cv");
-	error = kthread_create(audit_worker, NULL, &audit_thread, RFHIGHPID,
+	error = kproc_create(audit_worker, NULL, &audit_thread, RFHIGHPID,
 	    0, "audit");
 	if (error)
-		panic("audit_worker_init: kthread_create returned %d", error);
+		panic("audit_worker_init: kproc_create returned %d", error);
 }
Index: sys/sun4v/sun4v/simdisk.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/sun4v/sun4v/simdisk.c,v
retrieving revision 1.2
diff -d -u -r1.2 simdisk.c
--- sys/sun4v/sun4v/simdisk.c	24 Nov 2006 05:27:49 -0000	1.2
+++ sys/sun4v/sun4v/simdisk.c	20 Oct 2007 05:14:19 -0000
@@ -173,7 +173,7 @@
 	sc->hvd_sectorsize = HVD_BLOCKSIZE;
 	sc->hvd_fwsectors = 0;
 	sc->hvd_fwheads = 0;
-	error = kthread_create(hvd_kthread, sc, &sc->hvd_procp, 0, 0,
+	error = kproc_create(hvd_kthread, sc, &sc->hvd_procp, 0, 0,
 		     "hvd0");
         if (error != 0) {
 		free(sc, M_DEVBUF);
Index: sys/sys/kthread.h
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/sys/kthread.h,v
retrieving revision 1.8
diff -d -u -r1.8 kthread.h
--- sys/sys/kthread.h	2 Oct 2002 07:44:28 -0000	1.8
+++ sys/sys/kthread.h	20 Oct 2007 05:14:19 -0000
@@ -44,11 +44,11 @@
 
 void	kproc_shutdown(void *, int);
 void	kproc_start(const void *);
-int     kthread_create(void (*)(void *), void *, struct proc **,
+int     kproc_create(void (*)(void *), void *, struct proc **,
 	    int flags, int pages, const char *, ...) __printflike(6, 7);
-void    kthread_exit(int) __dead2;
-int	kthread_resume(struct proc *); /* XXXKSE */
-int	kthread_suspend(struct proc *, int); /* XXXKSE */
-void	kthread_suspend_check(struct proc *); /* XXXKSE */
+void    kproc_exit(int) __dead2;
+int	kproc_resume(struct proc *); /* XXXKSE */
+int	kproc_suspend(struct proc *, int); /* XXXKSE */
+void	kproc_suspend_check(struct proc *); /* XXXKSE */
 
 #endif /* !_SYS_KTHREAD_H_ */
Index: sys/ufs/ffs/ffs_softdep.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/ufs/ffs/ffs_softdep.c,v
retrieving revision 1.211
diff -d -u -r1.211 ffs_softdep.c
--- sys/ufs/ffs/ffs_softdep.c	22 Jun 2007 13:22:36 -0000	1.211
+++ sys/ufs/ffs/ffs_softdep.c	20 Oct 2007 05:14:20 -0000
@@ -728,7 +728,7 @@
 	td->td_pflags |= TDP_NORUNNINGBUF;
 
 	for (;;) {	
-		kthread_suspend_check(softdepproc);
+		kproc_suspend_check(softdepproc);
 		vfslocked = VFS_LOCK_GIANT((struct mount *)NULL);
 		ACQUIRE_LOCK(&lk);
 		/*
Index: sys/vm/vm_zeroidle.c
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/vm/vm_zeroidle.c,v
retrieving revision 1.49
diff -d -u -r1.49 vm_zeroidle.c
--- sys/vm/vm_zeroidle.c	14 Jul 2007 19:00:44 -0000	1.49
+++ sys/vm/vm_zeroidle.c	20 Oct 2007 05:14:20 -0000
@@ -147,7 +147,7 @@
 	int error;
 	struct thread *td;
 
-	error = kthread_create(vm_pagezero, NULL, &pagezero_proc, RFSTOPPED, 0,
+	error = kproc_create(vm_pagezero, NULL, &pagezero_proc, RFSTOPPED, 0,
 	    "pagezero");
 	if (error)
 		panic("pagezero_start: error %d\n", error);