From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Sat, 19 Jul 2003 21:14:53 +0000 (+0000)
Subject: Remove the priority part of the priority|flags argument to tsleep().  Only
X-Git-Tag: v2.0.1~13284
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/377d4740c43c7aa42f7d3ec7a4d4f6426009547d

Remove the priority part of the priority|flags argument to tsleep().  Only
flags are passed now.  The priority was a user scheduler thingy that is not
used by the LWKT subsystem.  For process statistics assume sleeps without
P_SINTR set to be disk-waits, and sleeps with it set to be normal sleeps.

This commit should not contain any operational changes.
---

diff --git a/sys/bus/cam/cam_periph.c b/sys/bus/cam/cam_periph.c
index 373b0dd2d4..796fd8dcce 100644
--- a/sys/bus/cam/cam_periph.c
+++ b/sys/bus/cam/cam_periph.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/cam_periph.c,v 1.24.2.3 2003/01/25 19:04:40 dillon Exp $
- * $DragonFly: src/sys/bus/cam/cam_periph.c,v 1.3 2003/06/26 20:27:44 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/cam_periph.c,v 1.4 2003/07/19 21:14:11 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -450,13 +450,13 @@ camperiphfree(struct cam_periph *periph)
  * Wait interruptibly for an exclusive lock.
  */
 int
-cam_periph_lock(struct cam_periph *periph, int priority)
+cam_periph_lock(struct cam_periph *periph, int flags)
 {
 	int error;
 
 	while ((periph->flags & CAM_PERIPH_LOCKED) != 0) {
 		periph->flags |= CAM_PERIPH_LOCK_WANTED;
-		if ((error = tsleep(periph, priority, "caplck", 0)) != 0)
+		if ((error = tsleep(periph, flags, "caplck", 0)) != 0)
 			return error;
 	}
 
@@ -707,7 +707,7 @@ cam_periph_getccb(struct cam_periph *periph, u_int32_t priority)
 		if ((periph->ccb_list.slh_first != NULL)
 		 && (periph->ccb_list.slh_first->pinfo.priority == priority))
 			break;
-		tsleep(&periph->ccb_list, PRIBIO, "cgticb", 0);
+		tsleep(&periph->ccb_list, 0, "cgticb", 0);
 	}
 
 	ccb_h = periph->ccb_list.slh_first;
@@ -724,7 +724,7 @@ cam_periph_ccbwait(union ccb *ccb)
 	s = splsoftcam();
 	if ((ccb->ccb_h.pinfo.index != CAM_UNQUEUED_INDEX)
 	 || ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG))
-		tsleep(&ccb->ccb_h.cbfcnp, PRIBIO, "cbwait", 0);
+		tsleep(&ccb->ccb_h.cbfcnp, 0, "cbwait", 0);
 
 	splx(s);
 }
diff --git a/sys/bus/cam/cam_periph.h b/sys/bus/cam/cam_periph.h
index 2dd40ffa70..b7cc666b28 100644
--- a/sys/bus/cam/cam_periph.h
+++ b/sys/bus/cam/cam_periph.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/cam_periph.h,v 1.6.2.1 2000/05/07 18:16:49 n_hibma Exp $
- * $DragonFly: src/sys/bus/cam/cam_periph.h,v 1.2 2003/06/17 04:28:18 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/cam_periph.h,v 1.3 2003/07/19 21:14:11 dillon Exp $
  */
 
 #ifndef _CAM_CAM_PERIPH_H
@@ -111,7 +111,7 @@ cam_status cam_periph_alloc(periph_ctor_t *periph_ctor,
 			    char *name, cam_periph_type type, struct cam_path *,
 			    ac_callback_t *, ac_code, void *arg);
 struct cam_periph *cam_periph_find(struct cam_path *path, char *name);
-int		cam_periph_lock(struct cam_periph *periph, int priority);
+int		cam_periph_lock(struct cam_periph *periph, int flags);
 void		cam_periph_unlock(struct cam_periph *periph);
 cam_status	cam_periph_acquire(struct cam_periph *periph);
 void		cam_periph_release(struct cam_periph *periph);
diff --git a/sys/bus/cam/scsi/scsi_cd.c b/sys/bus/cam/scsi/scsi_cd.c
index 2d0a40d76d..4c8dfd1b5a 100644
--- a/sys/bus/cam/scsi/scsi_cd.c
+++ b/sys/bus/cam/scsi/scsi_cd.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.31.2.13 2002/11/25 05:30:31 njl Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_cd.c,v 1.4 2003/06/23 17:55:26 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_cd.c,v 1.5 2003/07/19 21:14:14 dillon Exp $
  */
 /*
  * Portions of this driver taken from the original FreeBSD cd driver.
@@ -871,7 +871,7 @@ cdregisterexit:
 
 	/* Lock this peripheral until we are setup */
 	/* Can't block */
-	cam_periph_lock(periph, PRIBIO); 
+	cam_periph_lock(periph, 0); 
 
 	if ((softc->flags & CD_FLAG_CHANGER) == 0)
 		xpt_schedule(periph, /*priority*/5);
@@ -909,7 +909,7 @@ cdopen(dev_t dev, int flags, int fmt, struct thread *td)
 		return(ENXIO);
 	}
 
-	if ((error = cam_periph_lock(periph, PRIBIO | PCATCH)) != 0) {
+	if ((error = cam_periph_lock(periph, PCATCH)) != 0) {
 		splx(s);
 		return (error);
 	}
@@ -1007,7 +1007,7 @@ cdclose(dev_t dev, int flag, int fmt, struct thread *td)
 
 	softc = (struct cd_softc *)periph->softc;
 
-	if ((error = cam_periph_lock(periph, PRIBIO)) != 0)
+	if ((error = cam_periph_lock(periph, 0)) != 0)
 		return (error);
 
 	if ((softc->flags & CD_FLAG_DISC_REMOVABLE) != 0)
@@ -1355,7 +1355,7 @@ cdgetccb(struct cam_periph *periph, u_int32_t priority)
 				softc->changer->flags |= CHANGER_MANUAL_CALL;
 				cdrunchangerqueue(softc->changer);
 			} else
-				tsleep(&softc->changer, PRIBIO, "cgticb", 0);
+				tsleep(&softc->changer, 0, "cgticb", 0);
 		}
 		splx(s);
 	}
@@ -1841,7 +1841,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, 
 		  ("trying to do ioctl %#lx\n", cmd));
 
-	error = cam_periph_lock(periph, PRIBIO | PCATCH);
+	error = cam_periph_lock(periph, PCATCH);
 
 	if (error != 0)
 		return(error);
diff --git a/sys/bus/cam/scsi/scsi_ch.c b/sys/bus/cam/scsi/scsi_ch.c
index ac5c64343a..7ecf2b1788 100644
--- a/sys/bus/cam/scsi/scsi_ch.c
+++ b/sys/bus/cam/scsi/scsi_ch.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.20.2.2 2000/10/31 08:09:49 dwmalone Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_ch.c,v 1.3 2003/06/23 17:55:26 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_ch.c,v 1.4 2003/07/19 21:14:14 dillon Exp $
  */
 /*
  * Derived from the NetBSD SCSI changer driver.
@@ -420,7 +420,7 @@ chregister(struct cam_periph *periph, void *arg)
 	 * Lock this peripheral until we are setup.
 	 * This first call can't block
 	 */
-	(void)cam_periph_lock(periph, PRIBIO);
+	(void)cam_periph_lock(periph, 0);
 	xpt_schedule(periph, /*priority*/5);
 
 	return(CAM_REQ_CMP);
@@ -448,7 +448,7 @@ chopen(dev_t dev, int flags, int fmt, struct thread *td)
 		return(ENXIO);
 	}
 
-	if ((error = cam_periph_lock(periph, PRIBIO | PCATCH)) != 0) {
+	if ((error = cam_periph_lock(periph, PCATCH)) != 0) {
 		splx(s);
 		return (error);
 	}
@@ -492,7 +492,7 @@ chclose(dev_t dev, int flag, int fmt, struct thread *td)
 
 	softc = (struct ch_softc *)periph->softc;
 
-	if ((error = cam_periph_lock(periph, PRIBIO)) != 0)
+	if ((error = cam_periph_lock(periph, 0)) != 0)
 		return(error);
 
 	softc->flags &= ~CH_FLAG_OPEN;
diff --git a/sys/bus/cam/scsi/scsi_da.c b/sys/bus/cam/scsi/scsi_da.c
index e44181deb5..f9a0072378 100644
--- a/sys/bus/cam/scsi/scsi_da.c
+++ b/sys/bus/cam/scsi/scsi_da.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.42.2.36 2003/05/17 21:48:30 njl Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_da.c,v 1.4 2003/06/23 17:55:26 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_da.c,v 1.5 2003/07/19 21:14:14 dillon Exp $
  */
 
 #ifdef _KERNEL
@@ -617,7 +617,7 @@ daopen(dev_t dev, int flags, int fmt, struct thread *td)
 	    ("daopen: dev=%s (unit %d , partition %d)\n", devtoname(dev),
 	     unit, part));
 
-	if ((error = cam_periph_lock(periph, PRIBIO|PCATCH)) != 0) {
+	if ((error = cam_periph_lock(periph, PCATCH)) != 0) {
 		return (error); /* error code from tsleep */
 	}
 
@@ -736,7 +736,7 @@ daclose(dev_t dev, int flag, int fmt, struct thread *td)
 
 	softc = (struct da_softc *)periph->softc;
 
-	if ((error = cam_periph_lock(periph, PRIBIO)) != 0) {
+	if ((error = cam_periph_lock(periph, 0)) != 0) {
 		return (error); /* error code from tsleep */
 	}
 
@@ -897,7 +897,7 @@ daioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 
 	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("daioctl\n"));
 
-	if ((error = cam_periph_lock(periph, PRIBIO|PCATCH)) != 0) {
+	if ((error = cam_periph_lock(periph, PCATCH)) != 0) {
 		return (error); /* error code from tsleep */
 	}	
 
@@ -1328,7 +1328,7 @@ daregister(struct cam_periph *periph, void *arg)
 	 * Lock this peripheral until we are setup.
 	 * This first call can't block
 	 */
-	(void)cam_periph_lock(periph, PRIBIO);
+	(void)cam_periph_lock(periph, 0);
 	xpt_schedule(periph, /*priority*/5);
 
 	return(CAM_REQ_CMP);
diff --git a/sys/bus/cam/scsi/scsi_pass.c b/sys/bus/cam/scsi/scsi_pass.c
index 333cae1336..c45b18f86e 100644
--- a/sys/bus/cam/scsi/scsi_pass.c
+++ b/sys/bus/cam/scsi/scsi_pass.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.19 2000/01/17 06:27:37 mjacob Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_pass.c,v 1.4 2003/06/23 17:55:26 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_pass.c,v 1.5 2003/07/19 21:14:14 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -410,7 +410,7 @@ passopen(dev_t dev, int flags, int fmt, struct thread *td)
 		return(EINVAL);
 	}
 
-	if ((error = cam_periph_lock(periph, PRIBIO | PCATCH)) != 0) {
+	if ((error = cam_periph_lock(periph, PCATCH)) != 0) {
 		splx(s);
 		return (error);
 	}
@@ -445,7 +445,7 @@ passclose(dev_t dev, int flag, int fmt, struct thread *td)
 
 	softc = (struct pass_softc *)periph->softc;
 
-	if ((error = cam_periph_lock(periph, PRIBIO)) != 0)
+	if ((error = cam_periph_lock(periph, 0)) != 0)
 		return (error);
 
 	softc->flags &= ~PASS_FLAG_OPEN;
diff --git a/sys/bus/cam/scsi/scsi_pt.c b/sys/bus/cam/scsi/scsi_pt.c
index cf832fcf06..2b380458de 100644
--- a/sys/bus/cam/scsi/scsi_pt.c
+++ b/sys/bus/cam/scsi/scsi_pt.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.17 2000/01/17 06:27:37 mjacob Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_pt.c,v 1.2 2003/06/17 04:28:19 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_pt.c,v 1.3 2003/07/19 21:14:14 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -167,7 +167,7 @@ ptopen(dev_t dev, int flags, int fmt, struct proc *p)
 	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE,
 	    ("ptopen: dev=%s (unit %d)\n", devtoname(dev), unit));
 
-	if ((error = cam_periph_lock(periph, PRIBIO|PCATCH)) != 0) {
+	if ((error = cam_periph_lock(periph, PCATCH)) != 0) {
 		splx(s);
 		return (error); /* error code from tsleep */
 	}
@@ -201,7 +201,7 @@ ptclose(dev_t dev, int flag, int fmt, struct proc *p)
 
 	softc = (struct pt_softc *)periph->softc;
 
-	if ((error = cam_periph_lock(periph, PRIBIO)) != 0)
+	if ((error = cam_periph_lock(periph, 0)) != 0)
 		return (error); /* error code from tsleep */
 
 	softc->flags &= ~PT_FLAG_OPEN;
@@ -707,7 +707,7 @@ ptioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 
 	softc = (struct pt_softc *)periph->softc;
 
-	if ((error = cam_periph_lock(periph, PRIBIO|PCATCH)) != 0) {
+	if ((error = cam_periph_lock(periph, PCATCH)) != 0) {
 		return (error); /* error code from tsleep */
 	}	
 
diff --git a/sys/bus/cam/scsi/scsi_sa.c b/sys/bus/cam/scsi/scsi_sa.c
index a773ecb27a..6e4626523f 100644
--- a/sys/bus/cam/scsi/scsi_sa.c
+++ b/sys/bus/cam/scsi/scsi_sa.c
@@ -1,6 +1,6 @@
 /*
  * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.45.2.13 2002/12/17 17:08:50 trhodes Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_sa.c,v 1.4 2003/06/23 17:55:26 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_sa.c,v 1.5 2003/07/19 21:14:14 dillon Exp $
  *
  * Implementation of SCSI Sequential Access Peripheral driver for CAM.
  *
@@ -470,7 +470,7 @@ saopen(dev_t dev, int flags, int fmt, struct thread *td)
 		return (ENXIO);	
 	}
 	softc = (struct sa_softc *)periph->softc;
-	if ((error = cam_periph_lock(periph, PRIBIO|PCATCH)) != 0) {
+	if ((error = cam_periph_lock(periph, PCATCH)) != 0) {
 		splx(s);
 		return (error);
 	}
@@ -532,7 +532,7 @@ saclose(dev_t dev, int flag, int fmt, struct thread *td)
 	    ("saclose(%d): dev=0x%x softc=0x%x\n", unit, unit, softc->flags));
 
 
-	if ((error = cam_periph_lock(periph, PRIBIO)) != 0) {
+	if ((error = cam_periph_lock(periph, 0)) != 0) {
 		return (error);
 	}
 
@@ -825,7 +825,7 @@ saioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
 			 */
 			s = splsoftcam();
 			if ((periph->flags & CAM_PERIPH_LOCKED) == 0) {
-				error = cam_periph_lock(periph, PRIBIO|PCATCH);
+				error = cam_periph_lock(periph, PCATCH);
 				if (error != 0) {
 					splx(s);
 					return (error);
@@ -844,7 +844,7 @@ saioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
 			 * access to data structures.
 			 */
 			s = splsoftcam();
-			error = cam_periph_lock(periph, PRIBIO|PCATCH);
+			error = cam_periph_lock(periph, PCATCH);
 			if (error != 0) {
 				splx(s);
 				return (error);
diff --git a/sys/bus/cam/scsi/scsi_ses.c b/sys/bus/cam/scsi/scsi_ses.c
index 987b8d79da..f99a631a78 100644
--- a/sys/bus/cam/scsi/scsi_ses.c
+++ b/sys/bus/cam/scsi/scsi_ses.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.8.2.2 2000/08/08 23:19:21 mjacob Exp $ */
-/* $DragonFly: src/sys/bus/cam/scsi/scsi_ses.c,v 1.2 2003/06/17 04:28:19 dillon Exp $ */
+/* $DragonFly: src/sys/bus/cam/scsi/scsi_ses.c,v 1.3 2003/07/19 21:14:15 dillon Exp $ */
 /*
  * Copyright (c) 2000 Matthew Jacob
  * All rights reserved.
@@ -437,7 +437,7 @@ sesopen(dev_t dev, int flags, int fmt, struct proc *p)
 		splx(s);
 		return (ENXIO);
 	}
-	if ((error = cam_periph_lock(periph, PRIBIO | PCATCH)) != 0) {
+	if ((error = cam_periph_lock(periph, PCATCH)) != 0) {
 		splx(s);
 		return (error);
 	}
@@ -496,7 +496,7 @@ sesclose(dev_t dev, int flag, int fmt, struct proc *p)
 
 	softc = (struct ses_softc *)periph->softc;
 
-	if ((error = cam_periph_lock(periph, PRIBIO)) != 0)
+	if ((error = cam_periph_lock(periph, 0)) != 0)
 		return (error);
 
 	softc->ses_flags &= ~SES_FLAG_OPEN;
diff --git a/sys/bus/cam/scsi/scsi_target.c b/sys/bus/cam/scsi/scsi_target.c
index ccfede1243..2e9c43471e 100644
--- a/sys/bus/cam/scsi/scsi_target.c
+++ b/sys/bus/cam/scsi/scsi_target.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.22.2.7 2003/02/18 22:07:10 njl Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_target.c,v 1.2 2003/06/17 04:28:19 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_target.c,v 1.3 2003/07/19 21:14:15 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -837,8 +837,7 @@ targread(dev_t dev, struct uio *uio, int ioflag)
 	user_descr = TAILQ_FIRST(abort_queue);
 	while (ccb_h == NULL && user_descr == NULL) {
 		if ((ioflag & IO_NDELAY) == 0) {
-			error = tsleep(user_queue, PRIBIO | PCATCH,
-				       "targrd", 0);
+			error = tsleep(user_queue, PCATCH, "targrd", 0);
 			ccb_h = TAILQ_FIRST(user_queue);
 			user_descr = TAILQ_FIRST(abort_queue);
 			if (error != 0) {
@@ -1054,8 +1053,7 @@ abort_all_pending(struct targ_softc *softc)
 
 	/* If we aborted at least one pending CCB ok, wait for it. */
 	if (cab.ccb_h.status == CAM_REQ_CMP) {
-		tsleep(&softc->pending_ccb_queue, PRIBIO | PCATCH,
-		       "tgabrt", 0);
+		tsleep(&softc->pending_ccb_queue, PCATCH, "tgabrt", 0);
 	}
 
 	/* If we aborted anything from the work queue, wakeup user. */
diff --git a/sys/bus/firewire/firewirereg.h b/sys/bus/firewire/firewirereg.h
index 75a722b796..5d334f370b 100644
--- a/sys/bus/firewire/firewirereg.h
+++ b/sys/bus/firewire/firewirereg.h
@@ -32,7 +32,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.1.2.14 2003/05/01 06:24:37 simokawa Exp $
- * $DragonFly: src/sys/bus/firewire/firewirereg.h,v 1.3 2003/06/23 17:55:30 dillon Exp $
+ * $DragonFly: src/sys/bus/firewire/firewirereg.h,v 1.4 2003/07/19 21:14:21 dillon Exp $
  *
  */
 
@@ -292,7 +292,7 @@ void fw_drain_txq __P((struct firewire_comm *));
 extern int firewire_debug;
 extern devclass_t firewire_devclass;
 
-#define		FWPRI		((PZERO+8)|PCATCH)
+#define	FWPRI	PCATCH
 
 #if __FreeBSD_version >= 500000
 #define CALLOUT_INIT(x) callout_init(x, 0 /* mpsafe */)
diff --git a/sys/bus/iicbus/iiconf.c b/sys/bus/iicbus/iiconf.c
index 34a5103d9b..61f8817897 100644
--- a/sys/bus/iicbus/iiconf.c
+++ b/sys/bus/iicbus/iiconf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/iicbus/iiconf.c,v 1.10 1999/12/03 08:41:02 mdodd Exp $
- * $DragonFly: src/sys/bus/iicbus/iiconf.c,v 1.2 2003/06/17 04:28:27 dillon Exp $
+ * $DragonFly: src/sys/bus/iicbus/iiconf.c,v 1.3 2003/07/19 21:14:22 dillon Exp $
  *
  */
 #include <sys/param.h>
@@ -76,11 +76,11 @@ iicbus_poll(struct iicbus_softc *sc, int how)
 
 	switch (how) {
 	case (IIC_WAIT | IIC_INTR):
-		error = tsleep(sc, IICPRI|PCATCH, "iicreq", 0);
+		error = tsleep(sc, PCATCH, "iicreq", 0);
 		break;
 
 	case (IIC_WAIT | IIC_NOINTR):
-		error = tsleep(sc, IICPRI, "iicreq", 0);
+		error = tsleep(sc, 0, "iicreq", 0);
 		break;
 
 	default:
diff --git a/sys/bus/iicbus/iiconf.h b/sys/bus/iicbus/iiconf.h
index 3bc1d46865..d827dd5e74 100644
--- a/sys/bus/iicbus/iiconf.h
+++ b/sys/bus/iicbus/iiconf.h
@@ -24,15 +24,13 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/iicbus/iiconf.h,v 1.6 1999/08/28 00:41:59 peter Exp $
- * $DragonFly: src/sys/bus/iicbus/iiconf.h,v 1.2 2003/06/17 04:28:27 dillon Exp $
+ * $DragonFly: src/sys/bus/iicbus/iiconf.h,v 1.3 2003/07/19 21:14:22 dillon Exp $
  */
 #ifndef __IICONF_H
 #define __IICONF_H
 
 #include <sys/queue.h>
 
-#define IICPRI (PZERO+8)		/* XXX sleep/wakeup queue priority */
-
 #define n(flags) (~(flags) & (flags))
 
 #define LSB 0x1
diff --git a/sys/bus/ppbus/ppb_base.c b/sys/bus/ppbus/ppb_base.c
index df6159e43d..ef97429b17 100644
--- a/sys/bus/ppbus/ppb_base.c
+++ b/sys/bus/ppbus/ppb_base.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ppbus/ppb_base.c,v 1.10.2.1 2000/08/01 23:26:26 n_hibma Exp $
- * $DragonFly: src/sys/bus/ppbus/ppb_base.c,v 1.2 2003/06/17 04:28:29 dillon Exp $
+ * $DragonFly: src/sys/bus/ppbus/ppb_base.c,v 1.3 2003/07/19 21:14:25 dillon Exp $
  *
  */
 #include <sys/param.h>
@@ -75,13 +75,13 @@ ppb_poll_bus(device_t bus, int max,
 		switch (how) {
 		case PPB_NOINTR:
 			/* wait 10 ms */
-			tsleep((caddr_t)bus, PPBPRI, "ppbpoll", hz/100);
+			tsleep((caddr_t)bus, 0, "ppbpoll", hz/100);
 			break;
 
 		case PPB_INTR:
 		default:
 			/* wait 10 ms */
-			if (((error = tsleep((caddr_t)bus, PPBPRI | PCATCH,
+			if (((error = tsleep((caddr_t)bus, PCATCH,
 			    "ppbpoll", hz/100)) != EWOULDBLOCK) != 0) {
 				return (error);
 			}
diff --git a/sys/bus/ppbus/ppbconf.c b/sys/bus/ppbus/ppbconf.c
index 9a77a3496e..43b36eff9d 100644
--- a/sys/bus/ppbus/ppbconf.c
+++ b/sys/bus/ppbus/ppbconf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ppbus/ppbconf.c,v 1.17.2.1 2000/05/24 00:20:57 n_hibma Exp $
- * $DragonFly: src/sys/bus/ppbus/ppbconf.c,v 1.2 2003/06/17 04:28:29 dillon Exp $
+ * $DragonFly: src/sys/bus/ppbus/ppbconf.c,v 1.3 2003/07/19 21:14:25 dillon Exp $
  *
  */
 #include "opt_ppb_1284.h"
@@ -470,11 +470,11 @@ ppb_request_bus(device_t bus, device_t dev, int how)
 
 			switch (how) {
 			case (PPB_WAIT | PPB_INTR):
-				error = tsleep(ppb, PPBPRI|PCATCH, "ppbreq", 0);
+				error = tsleep(ppb, PCATCH, "ppbreq", 0);
 				break;
 
 			case (PPB_WAIT | PPB_NOINTR):
-				error = tsleep(ppb, PPBPRI, "ppbreq", 0);
+				error = tsleep(ppb, 0, "ppbreq", 0);
 				break;
 
 			default:
diff --git a/sys/bus/ppbus/ppbconf.h b/sys/bus/ppbus/ppbconf.h
index addc9f890e..d263e4fa75 100644
--- a/sys/bus/ppbus/ppbconf.h
+++ b/sys/bus/ppbus/ppbconf.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ppbus/ppbconf.h,v 1.17.2.1 2000/05/24 00:20:57 n_hibma Exp $
- * $DragonFly: src/sys/bus/ppbus/ppbconf.h,v 1.2 2003/06/17 04:28:29 dillon Exp $
+ * $DragonFly: src/sys/bus/ppbus/ppbconf.h,v 1.3 2003/07/19 21:14:25 dillon Exp $
  *
  */
 #ifndef __PPBCONF_H
@@ -32,11 +32,6 @@
 
 #include <sys/queue.h>
 
-/*
- * Parallel Port Bus sleep/wakeup queue.
- */
-#define PPBPRI	(PZERO+8)
-
 /*
  * Parallel Port Chipset mode masks.
  * NIBBLE mode is supposed to be available under each other modes.
diff --git a/sys/bus/smbus/smbconf.c b/sys/bus/smbus/smbconf.c
index cb3a0cd7df..20f8a04c5f 100644
--- a/sys/bus/smbus/smbconf.c
+++ b/sys/bus/smbus/smbconf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/smbus/smbconf.c,v 1.9 1999/12/03 08:41:08 mdodd Exp $
- * $DragonFly: src/sys/bus/smbus/smbconf.c,v 1.2 2003/06/17 04:28:29 dillon Exp $
+ * $DragonFly: src/sys/bus/smbus/smbconf.c,v 1.3 2003/07/19 21:14:28 dillon Exp $
  *
  */
 #include <sys/param.h>
@@ -104,11 +104,11 @@ smbus_poll(struct smbus_softc *sc, int how)
 
 	switch (how) {
 	case (SMB_WAIT | SMB_INTR):
-		error = tsleep(sc, SMBPRI|PCATCH, "smbreq", 0);
+		error = tsleep(sc, PCATCH, "smbreq", 0);
 		break;
 
 	case (SMB_WAIT | SMB_NOINTR):
-		error = tsleep(sc, SMBPRI, "smbreq", 0);
+		error = tsleep(sc, 0, "smbreq", 0);
 		break;
 
 	default:
diff --git a/sys/bus/smbus/smbconf.h b/sys/bus/smbus/smbconf.h
index 29450eb550..2a6ad6515d 100644
--- a/sys/bus/smbus/smbconf.h
+++ b/sys/bus/smbus/smbconf.h
@@ -24,15 +24,13 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/smbus/smbconf.h,v 1.6 1999/08/28 00:42:29 peter Exp $
- * $DragonFly: src/sys/bus/smbus/smbconf.h,v 1.2 2003/06/17 04:28:29 dillon Exp $
+ * $DragonFly: src/sys/bus/smbus/smbconf.h,v 1.3 2003/07/19 21:14:28 dillon Exp $
  */
 #ifndef __SMBONF_H
 #define __SMBONF_H
 
 #include <sys/queue.h>
 
-#define SMBPRI (PZERO+8)		/* XXX sleep/wakeup queue priority */
-
 #define n(flags) (~(flags) & (flags))
 
 /*
diff --git a/sys/bus/usb/uhci.c b/sys/bus/usb/uhci.c
index d85f641a75..64e51c5f53 100644
--- a/sys/bus/usb/uhci.c
+++ b/sys/bus/usb/uhci.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: uhci.c,v 1.80 2000/01/19 01:16:38 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.40.2.10 2003/01/12 02:13:58 iedowse Exp $	*/
-/*	$DragonFly: src/sys/bus/usb/uhci.c,v 1.4 2003/06/29 03:28:42 dillon Exp $	*/
+/*	$DragonFly: src/sys/bus/usb/uhci.c,v 1.5 2003/07/19 21:14:30 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -781,7 +781,7 @@ uhci_lock_frames(uhci_softc_t *sc)
 
 	while (sc->sc_vflock & UHCI_HAS_LOCK) {
 		sc->sc_vflock |= UHCI_WANT_LOCK;
-		tsleep(&sc->sc_vflock, PRIBIO, "uhcqhl", 0);
+		tsleep(&sc->sc_vflock, 0, "uhcqhl", 0);
 	}
 	sc->sc_vflock = UHCI_HAS_LOCK;
 	splx(s);
diff --git a/sys/bus/usb/usb.c b/sys/bus/usb/usb.c
index 91e9eeea39..55dfcf0e1a 100644
--- a/sys/bus/usb/usb.c
+++ b/sys/bus/usb/usb.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: usb.c,v 1.33 1999/11/22 21:57:09 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb.c,v 1.26.2.9 2002/11/13 15:15:22 joe Exp $	*/
-/*	$DragonFly: src/sys/bus/usb/usb.c,v 1.5 2003/06/27 01:53:24 dillon Exp $	*/
+/*	$DragonFly: src/sys/bus/usb/usb.c,v 1.6 2003/07/19 21:14:30 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -300,7 +300,7 @@ usb_event_thread(void *arg)
 		if (usb_noexplore < 2)
 #endif
 		usb_discover(sc);
-		(void)tsleep(&sc->sc_bus->needs_explore, PWAIT, "usbevt",
+		(void)tsleep(&sc->sc_bus->needs_explore, 0, "usbevt",
 #ifdef USB_DEBUG
 			     usb_noexplore ? 0 :
 #endif
@@ -373,7 +373,7 @@ usbread(dev_t dev, struct uio *uio, int flag)
 			error = EWOULDBLOCK;
 			break;
 		}
-		error = tsleep(&usb_events, PZERO | PCATCH, "usbrea", 0);
+		error = tsleep(&usb_events, PCATCH, "usbrea", 0);
 		if (error)
 			break;
 	}
@@ -699,7 +699,7 @@ usb_detach(device_ptr_t self, int flags)
 	/* Kill off event thread. */
 	if (sc->sc_event_thread) {
 		wakeup(&sc->sc_bus->needs_explore);
-		if (tsleep(sc, PWAIT, "usbdet", hz * 60))
+		if (tsleep(sc, 0, "usbdet", hz * 60))
 			printf("%s: event thread didn't die\n",
 			       USBDEVNAME(sc->sc_dev));
 		DPRINTF(("usb_detach: event thread dead\n"));
diff --git a/sys/bus/usb/usb_subr.c b/sys/bus/usb/usb_subr.c
index 27e00694fd..82f06ee27c 100644
--- a/sys/bus/usb/usb_subr.c
+++ b/sys/bus/usb/usb_subr.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: usb_subr.c,v 1.76 2000/04/27 15:26:50 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.23.2.8 2003/01/17 17:46:24 joe Exp $	*/
-/*	$DragonFly: src/sys/bus/usb/usb_subr.c,v 1.3 2003/06/19 00:58:32 dillon Exp $	*/
+/*	$DragonFly: src/sys/bus/usb/usb_subr.c,v 1.4 2003/07/19 21:14:30 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -296,7 +296,7 @@ usb_delay_ms(usbd_bus_handle bus, u_int ms)
 	if (bus->use_polling || cold)
 		delay((ms+1) * 1000);
 	else
-		tsleep(&ms, PRIBIO, "usbdly", (ms*hz+999)/1000 + 1);
+		tsleep(&ms, 0, "usbdly", (ms*hz+999)/1000 + 1);
 }
 
 /* Delay given a device handle. */
diff --git a/sys/bus/usb/usbdi.c b/sys/bus/usb/usbdi.c
index 68338bf856..9a8f3fe194 100644
--- a/sys/bus/usb/usbdi.c
+++ b/sys/bus/usb/usbdi.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: usbdi.c,v 1.60 2000/01/19 00:23:58 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.34.2.7 2002/11/06 14:03:37 joe Exp $	*/
-/*	$DragonFly: src/sys/bus/usb/usbdi.c,v 1.3 2003/06/29 03:28:42 dillon Exp $	*/
+/*	$DragonFly: src/sys/bus/usb/usbdi.c,v 1.4 2003/07/19 21:14:30 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -305,7 +305,7 @@ usbd_transfer(usbd_xfer_handle xfer)
 				pipe->methods->abort(xfer);
 		} else
 		/* XXX End hack XXX */
-			tsleep(xfer, PRIBIO, "usbsyn", 0);
+			tsleep(xfer, 0, "usbsyn", 0);
 	}
 	splx(s);
 	return (xfer->status);
diff --git a/sys/bus/usb/usbdi_util.c b/sys/bus/usb/usbdi_util.c
index 78928eff4a..ca70bb9684 100644
--- a/sys/bus/usb/usbdi_util.c
+++ b/sys/bus/usb/usbdi_util.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: usbdi_util.c,v 1.24 1999/11/17 23:00:50 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.15.2.5 2002/11/06 14:03:37 joe Exp $	*/
-/*	$DragonFly: src/sys/bus/usb/usbdi_util.c,v 1.2 2003/06/17 04:28:32 dillon Exp $	*/
+/*	$DragonFly: src/sys/bus/usb/usbdi_util.c,v 1.3 2003/07/19 21:14:30 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -448,7 +448,7 @@ usbd_bulk_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
 		splx(s);
 		return (err);
 	}
-	error = tsleep((caddr_t)xfer, PZERO | PCATCH, lbl, 0);
+	error = tsleep((caddr_t)xfer, PCATCH, lbl, 0);
 	splx(s);
 	if (error) {
 		DPRINTF(("usbd_bulk_transfer: tsleep=%d\n", error));
@@ -468,7 +468,7 @@ void
 usb_detach_wait(device_ptr_t dv)
 {
 	DPRINTF(("usb_detach_wait: waiting for %s\n", USBDEVPTRNAME(dv)));
-	if (tsleep(dv, PZERO, "usbdet", hz * 60))
+	if (tsleep(dv, 0, "usbdet", hz * 60))
 		printf("usb_detach_wait: %s didn't detach\n",
 		        USBDEVPTRNAME(dv));
 	DPRINTF(("usb_detach_wait: %s done\n", USBDEVPTRNAME(dv)));
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index 042bc31114..f8b57a526b 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.11.2.5 2001/10/20 04:15:21 mdodd Exp $
- * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.2 2003/06/17 04:28:20 dillon Exp $
+ * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.3 2003/07/19 21:14:15 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -789,7 +789,7 @@ oltr_close(struct oltr_softc *sc)
 
 	oltr_stop(sc);
 
-	tsleep(sc, PWAIT, "oltrclose", 30*hz);
+	tsleep(sc, 0, "oltrclose", 30*hz);
 }
 
 static void
@@ -995,7 +995,7 @@ oltr_init(void * xsc)
 	/*
 	 * Block on the ring insert and set a timeout
 	 */
-	tsleep(sc, PWAIT, "oltropen", 30*hz);
+	tsleep(sc, 0, "oltropen", 30*hz);
 
 	/*
 	 * Set up receive buffer ring
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h
index 3c35873f88..de0f2b8bc2 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/sys/contrib/ipfilter/netinet/ip_compat.h
@@ -6,7 +6,7 @@
  * @(#)ip_compat.h	1.8 1/14/96
  * $Id: ip_compat.h,v 2.26.2.46 2002/06/27 14:39:40 darrenr Exp $
  * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.13.2.5 2003/03/01 03:55:54 darrenr Exp $
- * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.2 2003/06/17 04:28:20 dillon Exp $
+ * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.3 2003/07/19 21:14:16 dillon Exp $
  */
 
 #ifndef	__IP_COMPAT_H__
@@ -611,7 +611,7 @@ extern	vm_map_t	kmem_map;
 #   define	KFREES(x,s)	FREE((x), M_TEMP)
 #  endif /* M_PFIL */
 #  define	UIOMOVE(a,b,c,d)	uiomove(a,b,d)
-#  define	SLEEP(id, n)	tsleep((id), PPAUSE|PCATCH, n, 0)
+#  define	SLEEP(id, n)	tsleep((id), PCATCH, n, 0)
 #  define	WAKEUP(id)	wakeup(id)
 # endif /* BSD */
 # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199407)) || \
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index 4096a15326..3499523127 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/pci/agp.c,v 1.3.2.4 2002/08/11 19:58:12 alc Exp $
- *	$DragonFly: src/sys/dev/agp/agp.c,v 1.4 2003/06/25 03:56:09 dillon Exp $
+ *	$DragonFly: src/sys/dev/agp/agp.c,v 1.5 2003/07/19 21:14:49 dillon Exp $
  */
 
 #include "opt_bus.h"
@@ -247,7 +247,7 @@ agp_generic_attach(device_t dev)
 	 * The lock is used to prevent re-entry to
 	 * agp_generic_bind_memory() since that function can sleep.
 	 */
-	lockinit(&sc->as_lock, PZERO|PCATCH, "agplk", 0, 0);
+	lockinit(&sc->as_lock, PCATCH, "agplk", 0, 0);
 
 	/*
 	 * Initialise stuff for the userland device.
diff --git a/sys/dev/atm/hfa/fore_stats.c b/sys/dev/atm/hfa/fore_stats.c
index 3fe8e999bf..e6e4e8f6e0 100644
--- a/sys/dev/atm/hfa/fore_stats.c
+++ b/sys/dev/atm/hfa/fore_stats.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.4 1999/08/28 00:41:52 peter Exp $
- *	@(#) $DragonFly: src/sys/dev/atm/hfa/fore_stats.c,v 1.2 2003/06/17 04:28:27 dillon Exp $
+ *	@(#) $DragonFly: src/sys/dev/atm/hfa/fore_stats.c,v 1.3 2003/07/19 21:14:21 dillon Exp $
  */
 
 /*
@@ -80,7 +80,7 @@ fore_get_stats(fup)
 	if (fup->fu_flags & FUF_STATCMD) {
 
 #if (defined(BSD) && (BSD >= 199103))
-		sst = tsleep((caddr_t)&fup->fu_stats, PWAIT|PCATCH, "fore", 0);
+		sst = tsleep((caddr_t)&fup->fu_stats, PCATCH, "fore", 0);
 #else
 		sst = sleep((caddr_t)&fup->fu_stats, PWAIT|PCATCH);
 		if (sst != 0)
@@ -138,7 +138,7 @@ fore_get_stats(fup)
 		 * Now wait for command to finish
 		 */
 #if (defined(BSD) && (BSD >= 199103))
-		sst = tsleep((caddr_t)&fup->fu_stats, PWAIT|PCATCH, "fore", 0);
+		sst = tsleep((caddr_t)&fup->fu_stats, PCATCH, "fore", 0);
 #else
 		sst = sleep((caddr_t)&fup->fu_stats, PWAIT|PCATCH);
 		if (sst != 0)
diff --git a/sys/dev/disk/ata/ata-all.c b/sys/dev/disk/ata/ata-all.c
index 084e59b465..429de147fb 100644
--- a/sys/dev/disk/ata/ata-all.c
+++ b/sys/dev/disk/ata/ata-all.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.50.2.45 2003/03/12 14:47:12 sos Exp $
- * $DragonFly: src/sys/dev/disk/ata/ata-all.c,v 1.4 2003/07/03 01:16:59 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ata/ata-all.c,v 1.5 2003/07/19 21:14:18 dillon Exp $
  */
 
 #include "opt_ata.h"
@@ -1105,7 +1105,7 @@ ata_command(struct ata_device *atadev, u_int8_t command,
 	if (atadev->channel->flags & ATA_QUEUED)
 	    ATA_OUTB(atadev->channel->r_altio, ATA_ALTSTAT, ATA_A_4BIT);
 
-	if (tsleep((caddr_t)atadev->channel, PRIBIO, "atacmd", 10 * hz)) {
+	if (tsleep((caddr_t)atadev->channel, 0, "atacmd", 10 * hz)) {
 	    ata_prtdev(atadev, "timeout waiting for interrupt\n");
 	    atadev->channel->active &= ~ATA_WAIT_INTR;
 	    error = -1;
diff --git a/sys/dev/disk/ata/ata-all.h b/sys/dev/disk/ata/ata-all.h
index 961ad3b54a..c6c1c8afdb 100644
--- a/sys/dev/disk/ata/ata-all.h
+++ b/sys/dev/disk/ata/ata-all.h
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.26.2.12 2003/01/30 07:19:59 sos Exp $
- * $DragonFly: src/sys/dev/disk/ata/ata-all.h,v 1.2 2003/06/17 04:28:22 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ata/ata-all.h,v 1.3 2003/07/19 21:14:18 dillon Exp $
  */
 
 /* ATA register defines */
@@ -276,7 +276,7 @@ int ata_dmadone(struct ata_channel *);
 
 #define ATA_SLEEPLOCK_CH(ch, value) {\
 	while ((ch)->active != ATA_IDLE)\
-	    tsleep((caddr_t)&(ch), PRIBIO, "atalck", 1);\
+	    tsleep((caddr_t)&(ch), 0, "atalck", 1);\
 	(ch)->active = value; }
 
 #define ATA_FORCELOCK_CH(ch, value) \
diff --git a/sys/dev/disk/ata/ata-raid.c b/sys/dev/disk/ata/ata-raid.c
index 10dc38e595..ae86a70360 100644
--- a/sys/dev/disk/ata/ata-raid.c
+++ b/sys/dev/disk/ata/ata-raid.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.3.2.19 2003/01/30 07:19:59 sos Exp $
- * $DragonFly: src/sys/dev/disk/ata/ata-raid.c,v 1.4 2003/06/23 17:55:29 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ata/ata-raid.c,v 1.5 2003/07/19 21:14:18 dillon Exp $
  */
 
 #include "opt_ata.h"
@@ -586,7 +586,7 @@ arstrategy(struct buf *bp)
 		     bp->b_pblkno < rdp->lock_end) ||
 		    ((bp->b_pblkno + chunk) > rdp->lock_start &&
 		     (bp->b_pblkno + chunk) <= rdp->lock_end)) {
-		    tsleep(rdp, PRIBIO, "arwait", 0);
+		    tsleep(rdp, 0, "arwait", 0);
 		}
 	    }
 	    if ((rdp->disks[buf1->drive].flags &
@@ -1431,7 +1431,7 @@ ar_rw(struct ad_softc *adp, u_int32_t lba, int count, caddr_t data, int flags)
 
     if (flags & AR_WAIT) {
 	while ((retry++ < (15*hz/10)) && (error = !(bp->b_flags & B_DONE)))
-	    error = tsleep(bp, PRIBIO, "arrw", 10);
+	    error = tsleep(bp, 0, "arrw", 10);
 	if (!error && (bp->b_flags & B_ERROR))
 	    error = bp->b_error;
 	free(bp, M_AR);
diff --git a/sys/dev/disk/ata/atapi-all.c b/sys/dev/disk/ata/atapi-all.c
index d8a68652f0..feb4c5f483 100644
--- a/sys/dev/disk/ata/atapi-all.c
+++ b/sys/dev/disk/ata/atapi-all.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ata/atapi-all.c,v 1.46.2.18 2002/10/31 23:10:33 thomas Exp $
- * $DragonFly: src/sys/dev/disk/ata/atapi-all.c,v 1.2 2003/06/17 04:28:22 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ata/atapi-all.c,v 1.3 2003/07/19 21:14:18 dillon Exp $
  */
 
 #include "opt_ata.h"
@@ -219,7 +219,7 @@ atapi_queue_cmd(struct ata_device *atadev, int8_t *ccb, caddr_t data,
 
     /* only sleep when command is in progress */
     if (request->error == EINPROGRESS)
-	tsleep((caddr_t)request, PRIBIO, "atprq", 0);
+	tsleep((caddr_t)request, 0, "atprq", 0);
     splx(s);
     error = request->error;
     if (error)
@@ -519,7 +519,7 @@ atapi_wait_dsc(struct ata_device *atadev, int timeout)
 	error = atapi_queue_cmd(atadev, ccb, NULL, 0, 0, 0, NULL, NULL);
 	if (error != EBUSY)
 	    break;
-	tsleep((caddr_t)&error, PRIBIO, "atpwt", hz / 2);
+	tsleep((caddr_t)&error, 0, "atpwt", hz / 2);
 	timeout -= (hz / 2);
     }
     return error;
diff --git a/sys/dev/disk/ata/atapi-cd.c b/sys/dev/disk/ata/atapi-cd.c
index 5cda8fbfef..5a6fbb85a3 100644
--- a/sys/dev/disk/ata/atapi-cd.c
+++ b/sys/dev/disk/ata/atapi-cd.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.48.2.20 2002/11/25 05:30:31 njl Exp $
- * $DragonFly: src/sys/dev/disk/ata/atapi-cd.c,v 1.5 2003/06/25 03:55:46 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ata/atapi-cd.c,v 1.6 2003/07/19 21:14:18 dillon Exp $
  */
 
 #include "opt_ata.h"
@@ -509,7 +509,7 @@ acdopen(dev_t dev, int flags, int fmt, struct thread *td)
 	if (!atapi_test_ready(cdp->device))
 	    break;
 	if (sense->sense_key == 2  && sense->asc == 4 && sense->ascq == 1)
-	    tsleep(&timeout, PRIBIO, "acdld", hz / 2);
+	    tsleep(&timeout, 0, "acdld", hz / 2);
 	else
 	    break;
     }
@@ -517,7 +517,7 @@ acdopen(dev_t dev, int flags, int fmt, struct thread *td)
     if (count_dev(dev) == 1) {
 	if (cdp->changer_info && cdp->slot != cdp->changer_info->current_slot) {
 	    acd_select_slot(cdp);
-	    tsleep(&cdp->changer_info, PRIBIO, "acdopn", 0);
+	    tsleep(&cdp->changer_info, 0, "acdopn", 0);
 	}
 	acd_prevent_allow(cdp, 1);
 	cdp->flags |= F_LOCKED;
@@ -537,7 +537,7 @@ acdclose(dev_t dev, int flags, int fmt, struct thread *td)
     if (count_dev(dev) == 1) {
 	if (cdp->changer_info && cdp->slot != cdp->changer_info->current_slot) {
 	    acd_select_slot(cdp);
-	    tsleep(&cdp->changer_info, PRIBIO, "acdclo", 0);
+	    tsleep(&cdp->changer_info, 0, "acdclo", 0);
 	}
 	acd_prevent_allow(cdp, 0);
 	cdp->flags &= ~F_LOCKED;
@@ -556,7 +556,7 @@ acdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
 
     if (cdp->changer_info && cdp->slot != cdp->changer_info->current_slot) {
 	acd_select_slot(cdp);
-	tsleep(&cdp->changer_info, PRIBIO, "acdctl", 0);
+	tsleep(&cdp->changer_info, 0, "acdctl", 0);
     }
     if (cdp->device->flags & ATA_D_MEDIA_CHANGED)
 	switch (cmd) {
@@ -1466,14 +1466,14 @@ acd_fixate(struct acd_softc *cdp, int multisession)
     /* some drives just return ready, wait for the expected fixate time */
     if ((error = atapi_test_ready(cdp->device)) != EBUSY) {
 	timeout = timeout / (cdp->cap.cur_write_speed / 177);
-	tsleep(&error, PRIBIO, "acdfix", timeout * hz / 2);
+	tsleep(&error, 0, "acdfix", timeout * hz / 2);
 	return atapi_test_ready(cdp->device);
     }
 
     while (timeout-- > 0) {
 	if ((error = atapi_test_ready(cdp->device)) != EBUSY)
 	    return error;
-	tsleep(&error, PRIBIO, "acdcld", hz/2);
+	tsleep(&error, 0, "acdcld", hz/2);
     }
     return EIO;
 }
diff --git a/sys/dev/disk/ata/atapi-tape.c b/sys/dev/disk/ata/atapi-tape.c
index 0ae9469cd9..380951188c 100644
--- a/sys/dev/disk/ata/atapi-tape.c
+++ b/sys/dev/disk/ata/atapi-tape.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.36.2.12 2002/07/31 11:19:26 sos Exp $
- * $DragonFly: src/sys/dev/disk/ata/atapi-tape.c,v 1.4 2003/06/23 17:55:29 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ata/atapi-tape.c,v 1.5 2003/07/19 21:14:18 dillon Exp $
  */
 
 #include "opt_ata.h"
@@ -629,7 +629,7 @@ ast_load_unload(struct ast_softc *stp, u_int8_t function)
     error = atapi_queue_cmd(stp->device, ccb, NULL, 0, 0, 10, NULL, NULL);
     if (error)
 	return error;
-    tsleep((caddr_t)&error, PRIBIO, "astlu", 1 * hz);
+    tsleep((caddr_t)&error, 0, "astlu", 1 * hz);
     if (function == SS_EJECT)
 	return 0;
     return atapi_wait_dsc(stp->device, 60*60);
diff --git a/sys/dev/disk/ccd/ccd.c b/sys/dev/disk/ccd/ccd.c
index a5d51b4b85..0beea2f7db 100644
--- a/sys/dev/disk/ccd/ccd.c
+++ b/sys/dev/disk/ccd/ccd.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.73.2.1 2001/09/11 09:49:52 kris Exp $ */
-/* $DragonFly: src/sys/dev/disk/ccd/ccd.c,v 1.6 2003/06/26 05:55:11 dillon Exp $ */
+/* $DragonFly: src/sys/dev/disk/ccd/ccd.c,v 1.7 2003/07/19 21:14:19 dillon Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
@@ -1679,7 +1679,7 @@ ccdlock(cs)
 
 	while ((cs->sc_flags & CCDF_LOCKED) != 0) {
 		cs->sc_flags |= CCDF_WANTED;
-		if ((error = tsleep(cs, PRIBIO | PCATCH, "ccdlck", 0)) != 0)
+		if ((error = tsleep(cs, PCATCH, "ccdlck", 0)) != 0)
 			return (error);
 	}
 	cs->sc_flags |= CCDF_LOCKED;
diff --git a/sys/dev/disk/fd/fd.c b/sys/dev/disk/fd/fd.c
index dee011f73d..3bf19eadc8 100644
--- a/sys/dev/disk/fd/fd.c
+++ b/sys/dev/disk/fd/fd.c
@@ -51,7 +51,7 @@
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
  * $FreeBSD: src/sys/isa/fd.c,v 1.176.2.8 2002/05/15 21:56:14 joerg Exp $
- * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.5 2003/06/25 03:55:56 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.6 2003/07/19 21:14:37 dillon Exp $
  *
  */
 
@@ -2294,7 +2294,7 @@ fdformat(dev_t dev, struct fd_formb *finfo, struct thread *td)
 	/* ...and wait for it to complete */
 	s = splbio();
 	while(!(bp->b_flags & B_DONE)) {
-		rv = tsleep((caddr_t)bp, PRIBIO, "fdform", 20 * hz);
+		rv = tsleep((caddr_t)bp, 0, "fdform", 20 * hz);
 		if (rv == EWOULDBLOCK)
 			break;
 	}
diff --git a/sys/dev/disk/isp/isp_freebsd.c b/sys/dev/disk/isp/isp_freebsd.c
index 1fa3e8f3be..ab6b516b82 100644
--- a/sys/dev/disk/isp/isp_freebsd.c
+++ b/sys/dev/disk/isp/isp_freebsd.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.32.2.20 2002/10/11 18:49:25 mjacob Exp $ */
-/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.c,v 1.3 2003/06/23 17:55:31 dillon Exp $ */
+/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.c,v 1.4 2003/07/19 21:14:23 dillon Exp $ */
 /*
  * Platform (FreeBSD) dependent common attachment code for Qlogic adapters.
  *
@@ -603,8 +603,7 @@ isp_psema_sig_rqe(struct ispsoftc *isp, int bus)
 {
 	while (isp->isp_osinfo.tmflags[bus] & TM_BUSY) {
 		isp->isp_osinfo.tmflags[bus] |= TM_WANTED;
-		if (tsleep(&isp->isp_osinfo.tmflags[bus],
-		    PRIBIO|PCATCH, "i0", 0)) {
+		if (tsleep(&isp->isp_osinfo.tmflags[bus], PCATCH, "i0", 0)) {
 			return (-1);
 		}
 		isp->isp_osinfo.tmflags[bus] |= TM_BUSY;
@@ -615,7 +614,7 @@ isp_psema_sig_rqe(struct ispsoftc *isp, int bus)
 static __inline int
 isp_cv_wait_timed_rqe(struct ispsoftc *isp, int bus, int timo)
 {
-	if (tsleep(&isp->isp_osinfo.rstatus[bus], PRIBIO, "qt1", timo)) {
+	if (tsleep(&isp->isp_osinfo.rstatus[bus], 0, "qt1", timo)) {
 		return (-1);
 	}
 	return (0);
@@ -1950,7 +1949,7 @@ isp_kthread(void *arg)
 					break;
 				}
 			}
-			tsleep(isp_kthread, PRIBIO, "isp_fcthrd", hz);
+			tsleep(isp_kthread, 0, "isp_fcthrd", hz);
 
 		}
 
@@ -1968,7 +1967,7 @@ isp_kthread(void *arg)
 			xpt_release_simq(isp->isp_sim, 1);
 			CAMLOCK_2_ISPLOCK(isp);
 		}
-		tsleep(&isp->isp_osinfo.kthread, PRIBIO, "isp_fc_worker", 0);
+		tsleep(&isp->isp_osinfo.kthread, 0, "isp_fc_worker", 0);
 		isp_prt(isp, ISP_LOGDEBUG0, "kthread: waiting until called");
 	}
 }
diff --git a/sys/dev/disk/isp/isp_freebsd.h b/sys/dev/disk/isp/isp_freebsd.h
index 2fa8c6652f..5f8755ebfd 100644
--- a/sys/dev/disk/isp/isp_freebsd.h
+++ b/sys/dev/disk/isp/isp_freebsd.h
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.26.2.17 2002/10/11 17:35:11 mjacob Exp $ */
-/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.h,v 1.3 2003/06/23 17:55:31 dillon Exp $ */
+/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.h,v 1.4 2003/07/19 21:14:23 dillon Exp $ */
 /*
  * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
  * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob
@@ -416,8 +416,7 @@ isp_mbox_wait_complete(struct ispsoftc *isp)
 	if (isp->isp_osinfo.intsok) {
 		int lim = ((isp->isp_mbxwrk0)? 120 : 20) * hz;
 		isp->isp_osinfo.mboxwaiting = 1;
-		(void) tsleep(&isp->isp_mbxworkp, PRIBIO,
-		    "isp_mboxwaiting", lim);
+		(void) tsleep(&isp->isp_mbxworkp, 0, "isp_mboxwaiting", lim);
 		if (isp->isp_mboxbsy != 0) {
 			isp_prt(isp, ISP_LOGWARN,
 			    "Interrupting Mailbox Command (0x%x) Timeout",
diff --git a/sys/dev/disk/mcd/mcd.c b/sys/dev/disk/mcd/mcd.c
index 423f88a8e9..64cf91c390 100644
--- a/sys/dev/disk/mcd/mcd.c
+++ b/sys/dev/disk/mcd/mcd.c
@@ -41,7 +41,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/mcd.c,v 1.115 2000/01/29 16:17:34 peter Exp $
- * $DragonFly: src/sys/dev/disk/mcd/Attic/mcd.c,v 1.2 2003/06/17 04:28:37 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/mcd/Attic/mcd.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -296,7 +296,7 @@ int mcdopen(dev_t dev, int flags, int fmt, struct proc *p)
 	if (    (cd->status & (MCDDSKCHNG|MCDDOOROPEN))
 	    || !(cd->status & MCDDSKIN))
 		for (retry = 0; retry < DISK_SENSE_SECS * WAIT_FRAC; retry++) {
-			(void) tsleep((caddr_t)cd, PSOCK | PCATCH, "mcdsn1", hz/WAIT_FRAC);
+			(void) tsleep((caddr_t)cd, PCATCH, "mcdsn1", hz/WAIT_FRAC);
 			if ((r = mcd_getstat(unit,1)) == -1)
 				return EIO;
 			if (r != -2)
@@ -553,7 +553,7 @@ MCD_TRACE("ioctl called 0x%lx\n", cmd);
 		if (    (cd->status & (MCDDSKCHNG|MCDDOOROPEN))
 		    || !(cd->status & MCDDSKIN))
 			for (retry = 0; retry < DISK_SENSE_SECS * WAIT_FRAC; retry++) {
-				(void) tsleep((caddr_t)cd, PSOCK | PCATCH, "mcdsn2", hz/WAIT_FRAC);
+				(void) tsleep((caddr_t)cd, PCATCH, "mcdsn2", hz/WAIT_FRAC);
 				if ((r = mcd_getstat(unit,1)) == -1)
 					return EIO;
 				if (r != -2)
@@ -1236,7 +1236,7 @@ mcd_close_tray(int unit)
 		outb(port+mcd_command, MCD_CMDCLOSETRAY);
 		for (retry = 0; retry < CLOSE_TRAY_SECS * WAIT_FRAC; retry++) {
 			if (inb(port+MCD_FLAGS) & MFL_STATUS_NOT_AVAIL)
-				(void) tsleep((caddr_t)cd, PSOCK | PCATCH, "mcdcls", hz/WAIT_FRAC);
+				(void) tsleep((caddr_t)cd, PCATCH, "mcdcls", hz/WAIT_FRAC);
 			else {
 				if ((r = mcd_getstat(unit,0)) == -1)
 					return EIO;
diff --git a/sys/dev/disk/scd/scd.c b/sys/dev/disk/scd/scd.c
index 68b0335583..ee198732c2 100644
--- a/sys/dev/disk/scd/scd.c
+++ b/sys/dev/disk/scd/scd.c
@@ -42,7 +42,7 @@
 
 
 /* $FreeBSD: src/sys/i386/isa/scd.c,v 1.54 2000/01/29 16:00:30 peter Exp $ */
-/* $DragonFly: src/sys/dev/disk/scd/Attic/scd.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ */
+/* $DragonFly: src/sys/dev/disk/scd/Attic/scd.c,v 1.3 2003/07/19 21:14:34 dillon Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -1433,7 +1433,7 @@ waitfor_status_bits(int unit, int bits_set, int bits_clear)
 			{
 				break;
 			}
-			tsleep(waitfor_status_bits, PZERO - 1, "waitfor", hz/10);
+			tsleep(waitfor_status_bits, 0, "waitfor", hz/10);
 		}
 	}
 	if ((c & bits_set) == bits_set &&
diff --git a/sys/dev/disk/wcd/wd_cd.c b/sys/dev/disk/wcd/wd_cd.c
index af28f20c90..c61d7e09c3 100644
--- a/sys/dev/disk/wcd/wd_cd.c
+++ b/sys/dev/disk/wcd/wd_cd.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/wd_cd.c,v 1.29 2000/01/29 16:00:33 peter Exp $
- * $DragonFly: src/sys/dev/disk/wcd/Attic/wd_cd.c,v 1.3 2003/06/25 03:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/wcd/Attic/wd_cd.c,v 1.4 2003/07/19 21:14:34 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -1208,8 +1208,8 @@ acd_eject(struct acd *cdp, int close)
     if (close)
         return 0;
 
-    tsleep((caddr_t) &lbolt, PRIBIO, "wcdej1", 0);
-    tsleep((caddr_t) &lbolt, PRIBIO, "wcdej2", 0);
+    tsleep((caddr_t) &lbolt, 0, "wcdej1", 0);
+    tsleep((caddr_t) &lbolt, 0, "wcdej2", 0);
 
     acd_request_wait(cdp, ATAPI_PREVENT_ALLOW, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
     cdp->flags &= ~F_LOCKED;
diff --git a/sys/dev/disk/wd/wd.c b/sys/dev/disk/wd/wd.c
index 3afe944def..f5d8839411 100644
--- a/sys/dev/disk/wd/wd.c
+++ b/sys/dev/disk/wd/wd.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/isa/wd.c,v 1.219.2.2 2000/08/04 22:31:07 peter Exp $
- * $DragonFly: src/sys/dev/disk/wd/Attic/wd.c,v 1.2 2003/06/17 04:28:37 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/wd/Attic/wd.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  */
 
 /* TODO:
@@ -1138,7 +1138,7 @@ wdopen(dev_t dev, int flags, int fmt, struct proc *p)
 
 	/* spin waiting for anybody else reading the disk label */
 	while (du->dk_flags & DKFL_LABELLING)
-		tsleep((caddr_t)&du->dk_flags, PZERO - 1, "wdopen", 1);
+		tsleep((caddr_t)&du->dk_flags, 0, "wdopen", 1);
 #if 1
 	wdsleep(du->dk_ctrlr, "wdopn1");
 	du->dk_flags |= DKFL_LABELLING;
@@ -2055,7 +2055,7 @@ wdsleep(int ctrlr, char *wmesg)
 	if (eide_quirks & Q_CMD640B)
 		ctrlr = PRIMARY;
 	while (wdtab[ctrlr].b_active)
-		tsleep((caddr_t)&wdtab[ctrlr].b_active, PZERO - 1, wmesg, 1);
+		tsleep((caddr_t)&wdtab[ctrlr].b_active, 0, wmesg, 1);
 	splx(s);
 }
 
diff --git a/sys/dev/disk/wfd/wfd.c b/sys/dev/disk/wfd/wfd.c
index 4faee4caec..96a2023824 100644
--- a/sys/dev/disk/wfd/wfd.c
+++ b/sys/dev/disk/wfd/wfd.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/wfd.c,v 1.35 2000/01/29 16:00:33 peter Exp $
- * $DragonFly: src/sys/dev/disk/wfd/Attic/wfd.c,v 1.3 2003/06/25 03:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/wfd/Attic/wfd.c,v 1.4 2003/07/19 21:14:34 dillon Exp $
  */
 
 /*
@@ -707,8 +707,8 @@ static int wfd_eject (struct wfd *t, int closeit)
 		return (0);
 
 	/* Give it some time to stop spinning. */
-	tsleep ((caddr_t)&lbolt, PRIBIO, "wfdej1", 0);
-	tsleep ((caddr_t)&lbolt, PRIBIO, "wfdej2", 0);
+	tsleep ((caddr_t)&lbolt, 0, "wfdej1", 0);
+	tsleep ((caddr_t)&lbolt, 0, "wfdej2", 0);
 
 	/* Unlock. */
 	wfd_request_wait (t, ATAPI_PREVENT_ALLOW,
diff --git a/sys/dev/disk/wt/wt.c b/sys/dev/disk/wt/wt.c
index bb568300aa..52725d8cc6 100644
--- a/sys/dev/disk/wt/wt.c
+++ b/sys/dev/disk/wt/wt.c
@@ -21,7 +21,7 @@
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
  * $FreeBSD: src/sys/i386/isa/wt.c,v 1.57.2.1 2000/08/08 19:49:53 peter Exp $
- * $DragonFly: src/sys/dev/disk/wt/wt.c,v 1.2 2003/06/17 04:28:37 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/wt/wt.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  *
  */
 
@@ -80,8 +80,6 @@
  */
 #define TRACE(s)                /* printf s */
 
-#define WTPRI                   (PZERO+10)      /* sleep priority */
-
 /*
  * Wangtek controller ports
  */
@@ -715,7 +713,7 @@ wtreadfm (wtinfo_t *t)
 static int
 wtwritefm (wtinfo_t *t)
 {
-	tsleep ((caddr_t)wtwritefm, WTPRI, "wtwfm", hz); /* timeout: 1 second */
+	tsleep ((caddr_t)wtwritefm, 0, "wtwfm", hz); /* timeout: 1 second */
 	t->flags &= ~(TPRO | TPWO);
 	if (! wtcmd (t, QIC_WRITEFM)) {
 		wtsense (t, 1, 0);
@@ -749,7 +747,7 @@ wtpoll (wtinfo_t *t, int mask, int bits)
 		s = inb (t->STATPORT);
 		if ((s & mask) != bits)
 			return (s);
-		tsleep ((caddr_t)wtpoll, WTPRI, "wtpoll", 1); /* timeout: 1 tick */
+		tsleep ((caddr_t)wtpoll, 0, "wtpoll", 1); /* timeout: 1 tick */
 	}
 }
 
@@ -785,7 +783,7 @@ wtwait (wtinfo_t *t, int catch, char *msg)
 
 	TRACE (("wtwait() `%s'\n", msg));
 	while (t->flags & (TPACTIVE | TPREW | TPRMARK | TPWMARK)) {
-		error = tsleep ((caddr_t)t, WTPRI | catch, msg, 0);
+		error = tsleep ((caddr_t)t, catch, msg, 0);
 		if (error)
 			return (error);
 	}
diff --git a/sys/dev/drm/drm_drv.h b/sys/dev/drm/drm_drv.h
index 0b1fd830e4..12d79ba1ed 100644
--- a/sys/dev/drm/drm_drv.h
+++ b/sys/dev/drm/drm_drv.h
@@ -29,7 +29,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *
  * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.13.2.1 2003/04/26 07:05:28 anholt Exp $
- * $DragonFly: src/sys/dev/drm/Attic/drm_drv.h,v 1.2 2003/06/17 04:28:24 dillon Exp $
+ * $DragonFly: src/sys/dev/drm/Attic/drm_drv.h,v 1.3 2003/07/19 21:14:20 dillon Exp $
  */
 
 /*
@@ -664,7 +664,7 @@ static int DRM(init)( device_t nbdev )
 	unit = minor(dev->device.dv_unit);
 #endif
 	DRM_SPININIT(dev->count_lock, "drm device");
-	lockinit(&dev->dev_lock, PZERO, "drmlk", 0, 0);
+	lockinit(&dev->dev_lock, 0, "drmlk", 0, 0);
 	dev->name = DRIVER_NAME;
 	DRM(mem_init)();
 	DRM(sysctl_init)(dev);
@@ -908,9 +908,7 @@ int DRM(close)(dev_t kdev, int flags, int fmt, DRM_STRUCTPROC *p)
 			atomic_inc( &dev->total_sleeps );
 #endif
 			retcode = tsleep((void *)&dev->lock.lock_queue,
-					PZERO|PCATCH,
-					"drmlk2",
-					0);
+					PCATCH, "drmlk2", 0);
 			if (retcode)
 				break;
 		}
@@ -1076,9 +1074,7 @@ int DRM(lock)( DRM_IOCTL_ARGS )
 
                                 /* Contention */
 			ret = tsleep((void *)&dev->lock.lock_queue,
-					PZERO|PCATCH,
-					"drmlk2",
-					0);
+					PCATCH, "drmlk2", 0);
 			if (ret)
 				break;
                 }
diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h
index fe95022809..4af4aabdad 100644
--- a/sys/dev/drm/drm_os_freebsd.h
+++ b/sys/dev/drm/drm_os_freebsd.h
@@ -1,6 +1,6 @@
 /*
  * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.10.2.1 2003/04/26 07:05:28 anholt Exp $
- * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.4 2003/07/06 21:23:47 dillon Exp $
+ * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.5 2003/07/19 21:14:20 dillon Exp $
  */
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -175,7 +175,7 @@ do {								\
 
 #define DRM_WAIT_ON( ret, queue, timeout, condition )			\
 while (!condition) {							\
-	ret = tsleep( &(queue), PZERO | PCATCH, "drmwtq", (timeout) );	\
+	ret = tsleep( &(queue), PCATCH, "drmwtq", (timeout) );		\
 	if ( ret )							\
 		return ret;						\
 }
diff --git a/sys/dev/drm/radeon/radeon_cp.c b/sys/dev/drm/radeon/radeon_cp.c
index 4d320a7da4..859241ccef 100644
--- a/sys/dev/drm/radeon/radeon_cp.c
+++ b/sys/dev/drm/radeon/radeon_cp.c
@@ -28,7 +28,7 @@
  *    Gareth Hughes <gareth@valinux.com>
  *
  * $FreeBSD: src/sys/dev/drm/radeon_cp.c,v 1.6.2.1 2003/04/26 07:05:29 anholt Exp $
- * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_cp.c,v 1.2 2003/06/17 04:28:24 dillon Exp $
+ * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_cp.c,v 1.3 2003/07/19 21:14:20 dillon Exp $
  */
 
 #include "dev/drm/radeon.h"
@@ -1396,7 +1396,7 @@ void radeon_do_release( drm_device_t *dev )
 #ifdef __linux__
 				schedule();
 #else
-				tsleep(&ret, PZERO, "rdnrel", 1);
+				tsleep(&ret, 0, "rdnrel", 1);
 #endif
 			}
 			radeon_do_cp_stop( dev_priv );
diff --git a/sys/dev/misc/gpib/gpib.c b/sys/dev/misc/gpib/gpib.c
index efb31189e6..c946311b1c 100644
--- a/sys/dev/misc/gpib/gpib.c
+++ b/sys/dev/misc/gpib/gpib.c
@@ -17,7 +17,7 @@
  * all derivative works or modified versions.
  *
  * $FreeBSD: src/sys/i386/isa/gpib.c,v 1.29 2000/01/29 16:17:32 peter Exp $
- * $DragonFly: src/sys/dev/misc/gpib/gpib.c,v 1.2 2003/06/17 04:28:37 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/gpib/gpib.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  *
  */
 /*Please read the README file for usage information*/
@@ -33,7 +33,7 @@
 
 #define MIN(a,b) ((a < b) ? a : b)
 
-#define GPIBPRI  (PZERO+8)|PCATCH
+#define GPIBPRI  PCATCH
 #define SLEEP_MAX 1000
 #define SLEEP_MIN 4
 
diff --git a/sys/dev/misc/kbd/kbd.c b/sys/dev/misc/kbd/kbd.c
index 34fc594db0..3eef94b8c3 100644
--- a/sys/dev/misc/kbd/kbd.c
+++ b/sys/dev/misc/kbd/kbd.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/kbd/kbd.c,v 1.17.2.2 2001/07/30 16:46:43 yokota Exp $
- * $DragonFly: src/sys/dev/misc/kbd/kbd.c,v 1.3 2003/06/23 17:55:31 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/kbd/kbd.c,v 1.4 2003/07/19 21:14:23 dillon Exp $
  */
 
 #include "opt_kbd.h"
@@ -582,7 +582,7 @@ genkbdread(dev_t dev, struct uio *uio, int flag)
 			return EWOULDBLOCK;
 		}
 		sc->gkb_flags |= KB_ASLEEP;
-		error = tsleep((caddr_t)sc, PZERO | PCATCH, "kbdrea", 0);
+		error = tsleep((caddr_t)sc, PCATCH, "kbdrea", 0);
 		kbd = kbd_get_keyboard(KBD_INDEX(dev));
 		if ((kbd == NULL) || !KBD_IS_VALID(kbd)) {
 			splx(s);
diff --git a/sys/dev/misc/lpt/lpt.c b/sys/dev/misc/lpt/lpt.c
index ddc14199bd..3cae9d2b55 100644
--- a/sys/dev/misc/lpt/lpt.c
+++ b/sys/dev/misc/lpt/lpt.c
@@ -49,7 +49,7 @@
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
  *	From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp
  * $FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.15.2.3 2000/07/07 00:30:40 obrien Exp $
- * $DragonFly: src/sys/dev/misc/lpt/lpt.c,v 1.3 2003/06/23 17:55:33 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/lpt/lpt.c,v 1.4 2003/07/19 21:14:25 dillon Exp $
  */
 
 /*
@@ -102,7 +102,6 @@ static int volatile lptflag = 1;
 #define	LPINITRDY	4	/* wait up to 4 seconds for a ready */
 #define	LPTOUTINITIAL	10	/* initial timeout to wait for ready 1/10 s */
 #define	LPTOUTMAX	1	/* maximal timeout 1 s */
-#define	LPPRI		(PZERO+8)
 #define	BUFSIZE		1024
 #define	BUFSTATSIZE	32
 
@@ -528,7 +527,7 @@ lptopen(dev_t dev, int flags, int fmt, struct thread *p)
 		}
 
 		/* wait 1/4 second, give up if we get a signal */
-		if (tsleep((caddr_t)lptdev, LPPRI|PCATCH, "lptinit", hz/4) !=
+		if (tsleep((caddr_t)lptdev, PCATCH, "lptinit", hz/4) !=
 		    EWOULDBLOCK) {
 			sc->sc_state = 0;
 			splx(s);
@@ -602,7 +601,7 @@ lptclose(dev_t dev, int flags, int fmt, struct thread *p)
 			(LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) !=
 			(LPS_SEL|LPS_NBSY|LPS_NERR) || sc->sc_xfercnt)
 			/* wait 1/4 second, give up if we get a signal */
-			if (tsleep((caddr_t)lptdev, LPPRI|PCATCH,
+			if (tsleep((caddr_t)lptdev, PCATCH,
 				"lpclose", hz) != EWOULDBLOCK)
 				break;
 
@@ -666,7 +665,7 @@ lpt_pushbytes(device_t dev)
 				 */
 				if (tic > MAX_SLEEP)
 					tic = MAX_SLEEP;
-				err = tsleep((caddr_t)dev, LPPRI,
+				err = tsleep((caddr_t)dev, 0,
 					LPT_NAME "poll", tic);
 				if (err != EWOULDBLOCK) {
 					return (err);
@@ -802,7 +801,7 @@ lptwrite(dev_t dev, struct uio *uio, int ioflag)
 			lprintf(("W "));
 			if (sc->sc_state & OBUSY)
 				if ((err = tsleep((caddr_t)lptdev,
-					 LPPRI|PCATCH, LPT_NAME "write", 0))) {
+					 PCATCH, LPT_NAME "write", 0))) {
 					sc->sc_state |= INTERRUPTED;
 					return(err);
 				}
diff --git a/sys/dev/misc/mse/mse.c b/sys/dev/misc/mse/mse.c
index b5e8b7438e..835d27d710 100644
--- a/sys/dev/misc/mse/mse.c
+++ b/sys/dev/misc/mse/mse.c
@@ -12,7 +12,7 @@
  * without express or implied warranty.
  *
  * $FreeBSD: src/sys/i386/isa/mse.c,v 1.49.2.1 2000/03/20 13:58:47 yokota Exp $
- * $DragonFly: src/sys/dev/misc/mse/mse.c,v 1.2 2003/06/17 04:28:37 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/mse/mse.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -245,8 +245,6 @@ static	void		mse_getati __P((bus_space_tag_t t,
 					bus_space_handle_t h,
 					int *dx, int *dy, int *but));
 
-#define	MSEPRI	(PZERO + 3)
-
 /*
  * Table of mouse types.
  * Keep the Logitech last, since I haven't figured out how to probe it
@@ -481,8 +479,7 @@ mseread(dev, uio, ioflag)
 				return (0);
 			}
 			sc->sc_flags |= MSESC_WANT;
-			error = tsleep((caddr_t)sc, MSEPRI | PCATCH,
-				"mseread", 0);
+			error = tsleep((caddr_t)sc, PCATCH, "mseread", 0);
 			if (error) {
 				splx(s);
 				return (error);
diff --git a/sys/dev/misc/musycc/musycc.c b/sys/dev/misc/musycc/musycc.c
index b6756e7bd4..8f489c0a9b 100644
--- a/sys/dev/misc/musycc/musycc.c
+++ b/sys/dev/misc/musycc/musycc.c
@@ -7,7 +7,7 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/dev/musycc/musycc.c,v 1.17.2.3 2001/03/13 22:05:36 phk Exp $
- * $DragonFly: src/sys/dev/misc/musycc/musycc.c,v 1.2 2003/06/17 04:28:28 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/musycc/musycc.c,v 1.3 2003/07/19 21:14:24 dillon Exp $
  *
  *
  *
@@ -373,7 +373,7 @@ init_card(struct csoftc *csc)
 
 	csc->state = C_INIT;
 	csc->reg->srd = 0x100;
-	tsleep(csc, PZERO | PCATCH, "icard", hz / 10);
+	tsleep(csc, PCATCH, "icard", hz / 10);
 	csc->reg->gbp = vtophys(csc->ram);
 	csc->ram->glcd = 0x3f30;	/* XXX: designer magic */
 	
@@ -382,7 +382,7 @@ init_card(struct csoftc *csc)
 	csc->ram->dacbp = 0;		/* 32bit only */
 
 	csc->reg->srd = csc->serial[0].last = 0x400;
-	tsleep(&csc->serial[0].last, PZERO + PCATCH, "con1", hz);
+	tsleep(&csc->serial[0].last, PCATCH, "con1", hz);
 	timeout(poke_847x, NULL, 1);
 	csc->state = C_RUNNING;
 }
@@ -394,7 +394,7 @@ init_ctrl(struct softc *sc)
 
 	printf("init_ctrl(%p) [%s] [%08x]\n", sc, sc->nodename, sc->csc->reg->glcd);
 	init_8370(sc);
-	tsleep(sc, PZERO | PCATCH, "ds8370", hz);
+	tsleep(sc, PCATCH, "ds8370", hz);
 	printf("%s: glcd: [%08x]\n", sc->nodename, sc->csc->reg->glcd);
 	sc->reg->gbp = vtophys(sc->ram);
 	sc->ram->grcd =  0x00000001;	/* RXENBL */
@@ -425,9 +425,9 @@ init_ctrl(struct softc *sc)
 		sc->ram->rtsm[i] = 0;
 	}
 	sc->reg->srd = sc->last = 0x500;
-	tsleep(&sc->last, PZERO + PCATCH, "con1", hz);
+	tsleep(&sc->last, PCATCH, "con1", hz);
 	sc->reg->srd = sc->last = 0x520;
-	tsleep(&sc->last, PZERO + PCATCH, "con1", hz);
+	tsleep(&sc->last, PCATCH, "con1", hz);
 }
 
 /*
@@ -909,7 +909,7 @@ musycc_config(node_p node, char *set, char *ret)
 	if (csc->state == C_IDLE) 
 		init_card(csc);
 	while (csc->state != C_RUNNING)
-		tsleep(&csc->state, PZERO + PCATCH, "crun", hz/10);
+		tsleep(&csc->state, PCATCH, "crun", hz/10);
 	if (set != NULL) {
 		if (!strncmp(set, "line ", 5)) {
 			wframing = sc->framing;
@@ -1044,7 +1044,7 @@ musycc_newhook(node_p node, hook_p hook, const char *name)
 	csc = sc->csc;
 
 	while (csc->state != C_RUNNING)
-		tsleep(&csc->state, PZERO + PCATCH, "crun", hz/10);
+		tsleep(&csc->state, PCATCH, "crun", hz/10);
 
 	if (sc->framing == WHOKNOWS)
 		return (EINVAL);
@@ -1198,7 +1198,7 @@ musycc_connect(hook_p hook)
 	ch = sch->chan;
 
 	while (csc->state != C_RUNNING)
-		tsleep(&csc->state, PZERO + PCATCH, "crun", hz/10);
+		tsleep(&csc->state, PCATCH, "crun", hz/10);
 
 	if (sch->state == UP)
 		return (0);
@@ -1231,9 +1231,9 @@ musycc_connect(hook_p hook)
 
 	/* Reread the Time Slot Map */
 	sc->reg->srd = sc->last = 0x1800;
-	tsleep(&sc->last, PZERO + PCATCH, "con1", hz);
+	tsleep(&sc->last, PCATCH, "con1", hz);
 	sc->reg->srd = sc->last = 0x1820;
-	tsleep(&sc->last, PZERO + PCATCH, "con2", hz);
+	tsleep(&sc->last, PCATCH, "con2", hz);
 
 	/* Set the channel mode */
 	sc->ram->tcct[ch] = 0x2800; /* HDLC-FCS16 | MAXSEL[2] */
@@ -1250,9 +1250,9 @@ musycc_connect(hook_p hook)
 
 	/* Reread the Channel Configuration Descriptor for this channel */
 	sc->reg->srd = sc->last = 0x0b00 + ch;
-	tsleep(&sc->last, PZERO + PCATCH, "con3", hz);
+	tsleep(&sc->last, PCATCH, "con3", hz);
 	sc->reg->srd = sc->last = 0x0b20 + ch;
-	tsleep(&sc->last, PZERO + PCATCH, "con4", hz);
+	tsleep(&sc->last, PCATCH, "con4", hz);
 
 	/*
 	 * Figure out how many receive buffers we want:  10 + nts * 2
@@ -1307,9 +1307,9 @@ musycc_connect(hook_p hook)
 
 	/* Activate the Channel */
 	sc->reg->srd = sc->last = 0x0800 + ch;
-	tsleep(&sc->last, PZERO + PCATCH, "con4", hz);
+	tsleep(&sc->last, PCATCH, "con4", hz);
 	sc->reg->srd = sc->last = 0x0820 + ch;
-	tsleep(&sc->last, PZERO + PCATCH, "con3", hz);
+	tsleep(&sc->last, PCATCH, "con3", hz);
 
 	return (0);
 
@@ -1338,13 +1338,13 @@ musycc_disconnect(hook_p hook)
 	ch = sch->chan;
 
 	while (csc->state != C_RUNNING)
-		tsleep(&csc->state, PZERO + PCATCH, "crun", hz/10);
+		tsleep(&csc->state, PCATCH, "crun", hz/10);
 
 	/* Deactivate the channel */
 	sc->reg->srd = sc->last = 0x0900 + sch->chan;
-	tsleep(&sc->last, PZERO + PCATCH, "con3", hz);
+	tsleep(&sc->last, PCATCH, "con3", hz);
 	sc->reg->srd = sc->last = 0x0920 + sch->chan;
-	tsleep(&sc->last, PZERO + PCATCH, "con4", hz);
+	tsleep(&sc->last, PCATCH, "con4", hz);
 
 	if (sch->state == DOWN)
 		return (0);
diff --git a/sys/dev/misc/nmdm/nmdm.c b/sys/dev/misc/nmdm/nmdm.c
index 51b5e8b805..2aaa83bc29 100644
--- a/sys/dev/misc/nmdm/nmdm.c
+++ b/sys/dev/misc/nmdm/nmdm.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.5.2.1 2001/08/11 00:54:14 mp Exp $
- * $DragonFly: src/sys/dev/misc/nmdm/nmdm.c,v 1.4 2003/06/25 03:55:47 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/nmdm/nmdm.c,v 1.5 2003/07/19 21:14:25 dillon Exp $
  */
 
 /*
@@ -233,8 +233,7 @@ nmdmopen(dev_t dev, int flag, int devtype, struct thread *td)
 	while ((tp->t_state & TS_CARR_ON) == 0) {
 		if (flag & FNONBLOCK)
 			break;
-		error = ttysleep(tp, TSA_CARR_ON(tp), TTIPRI | PCATCH,
-				 "nmdopn", 0);
+		error = ttysleep(tp, TSA_CARR_ON(tp), PCATCH, "nmdopn", 0);
 		if (error)
 			return (error);
 	}
@@ -315,8 +314,7 @@ nmdmread(dev, uio, flag)
 		if (flag & IO_NDELAY) {
 			return (EWOULDBLOCK);
 		}
-		error = tsleep(TSA_PTC_READ(tp),
-				TTIPRI | PCATCH, "nmdout", 0);
+		error = tsleep(TSA_PTC_READ(tp), PCATCH, "nmdout", 0);
 		}
 	}
 #else
@@ -402,7 +400,7 @@ again:
 					return (0);
 				}
 				error = tsleep(TSA_PTC_WRITE(tp),
-						TTOPRI | PCATCH, "nmdout", 0);
+						PCATCH, "nmdout", 0);
 				if (error) {
 					/*
 					 * Tsleep returned (signal?).
diff --git a/sys/dev/misc/pcic/i82365.c b/sys/dev/misc/pcic/i82365.c
index e21410574c..05fc0f479f 100644
--- a/sys/dev/misc/pcic/i82365.c
+++ b/sys/dev/misc/pcic/i82365.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: i82365.c,v 1.25 1999/10/15 06:07:27 haya Exp $	*/
 /* $FreeBSD: src/sys/dev/pcic/i82365.c,v 1.16.2.1 2000/05/23 03:57:02 imp Exp $ */
-/* $DragonFly: src/sys/dev/misc/pcic/Attic/i82365.c,v 1.3 2003/06/27 01:53:23 dillon Exp $ */
+/* $DragonFly: src/sys/dev/misc/pcic/Attic/i82365.c,v 1.4 2003/07/19 21:14:25 dillon Exp $ */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -508,12 +508,12 @@ pcic_event_thread(void *arg)
 		s = splhigh();
 		if ((pe = STAILQ_FIRST(&h->events)) == NULL) {
 			splx(s);
-			(void) tsleep(&h->events, PWAIT, "pcicev", 0);
+			(void) tsleep(&h->events, 0, "pcicev", 0);
 			continue;
 		} else {
 			splx(s);
 			/* sleep .25s to be enqueued chatterling interrupts */
-			(void) tsleep((caddr_t)pcic_event_thread, PWAIT, "pcicss", hz/4);
+			(void) tsleep((caddr_t)pcic_event_thread, 0, "pcicss", hz/4);
 		}
 		s = splhigh();
 		STAILQ_REMOVE_HEAD_UNTIL(&h->events, pe, pe_q);
diff --git a/sys/dev/misc/ppc/ppc.c b/sys/dev/misc/ppc/ppc.c
index d93249a2c4..547fa5f637 100644
--- a/sys/dev/misc/ppc/ppc.c
+++ b/sys/dev/misc/ppc/ppc.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/isa/ppc.c,v 1.26.2.5 2001/10/02 05:21:45 nsouch Exp $
- * $DragonFly: src/sys/dev/misc/ppc/ppc.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/ppc/ppc.c,v 1.3 2003/07/19 21:14:37 dillon Exp $
  *
  */
 
@@ -1431,7 +1431,7 @@ ppc_exec_microseq(device_t dev, struct ppb_microseq **p_msq)
 
 		case MS_OP_ADELAY:
 			if (mi->arg[0].i)
-				tsleep(NULL, PPBPRI, "ppbdelay",
+				tsleep(NULL, 0, "ppbdelay",
 						mi->arg[0].i * (hz/1000));
 			INCR_PC;
 			break;
@@ -1720,8 +1720,7 @@ ppc_write(device_t dev, char *buf, int len, int how)
 		 */
 		do {
 			/* release CPU */
-			error = tsleep((caddr_t)ppc,
-				PPBPRI | PCATCH, "ppcdma", 0);
+			error = tsleep((caddr_t)ppc, PCATCH, "ppcdma", 0);
 
 		} while (error == EWOULDBLOCK);
 
@@ -1752,7 +1751,7 @@ ppc_write(device_t dev, char *buf, int len, int how)
 #ifdef PPC_DEBUG
 			printf("Z");
 #endif
-			error = tsleep((caddr_t)ppc, PPBPRI | PCATCH, "ppcfifo", hz/100);
+			error = tsleep((caddr_t)ppc, PCATCH, "ppcfifo", hz/100);
 			if (error != EWOULDBLOCK) {
 #ifdef PPC_DEBUG
 				printf("I");
diff --git a/sys/dev/misc/ppi/ppi.c b/sys/dev/misc/ppi/ppi.c
index 3939ea28c3..042eecff39 100644
--- a/sys/dev/misc/ppi/ppi.c
+++ b/sys/dev/misc/ppi/ppi.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.21.2.3 2000/08/07 18:24:43 peter Exp $
- * $DragonFly: src/sys/dev/misc/ppi/ppi.c,v 1.3 2003/06/23 17:55:33 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/ppi/ppi.c,v 1.4 2003/07/19 21:14:25 dillon Exp $
  *
  */
 #include "opt_ppb_1284.h"
@@ -357,7 +357,7 @@ ppiread(dev_t dev, struct uio *uio, int ioflag)
 			/* XXX Wait 2 seconds to let the remote host some
 			 * time to terminate its interrupt
 			 */
-			tsleep(ppi, PPBPRI, "ppiread", 2*hz);
+			tsleep(ppi, 0, "ppiread", 2*hz);
 			
 			if ((error = ppb_1284_negociate(ppbus,
 				ppi->ppi_mode = PPB_BYTE, 0)))
@@ -466,7 +466,7 @@ ppiwrite(dev_t dev, struct uio *uio, int ioflag)
 		ppi_enable_intr(ppidev);
 
 		/* sleep until IEEE1284 negociation starts */
-		error = tsleep(ppi, PCATCH | PPBPRI, "ppiwrite", 0);
+		error = tsleep(ppi, PCATCH, "ppiwrite", 0);
 
 		switch (error) {
 		case 0:
diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c
index 96fc16d855..87b15a705e 100644
--- a/sys/dev/misc/psm/psm.c
+++ b/sys/dev/misc/psm/psm.c
@@ -21,7 +21,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/isa/psm.c,v 1.23.2.6 2002/03/27 16:53:35 pb Exp $
- * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.3 2003/06/23 17:55:40 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.4 2003/07/19 21:14:37 dillon Exp $
  */
 
 /*
@@ -1530,7 +1530,7 @@ psmread(dev_t dev, struct uio *uio, int flag)
             return EWOULDBLOCK;
         }
         sc->state |= PSM_ASLP;
-        error = tsleep((caddr_t) sc, PZERO | PCATCH, "psmrea", 0);
+        error = tsleep((caddr_t) sc, PCATCH, "psmrea", 0);
         sc->state &= ~PSM_ASLP;
         if (error) {
             splx(s);
diff --git a/sys/dev/misc/snp/snp.c b/sys/dev/misc/snp/snp.c
index 45dd933bc2..ef9e4a768e 100644
--- a/sys/dev/misc/snp/snp.c
+++ b/sys/dev/misc/snp/snp.c
@@ -13,7 +13,7 @@
  * Snoop stuff.
  *
  * $FreeBSD: src/sys/dev/snp/snp.c,v 1.69.2.2 2002/05/06 07:30:02 dd Exp $
- * $DragonFly: src/sys/dev/misc/snp/snp.c,v 1.4 2003/06/25 03:55:49 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/snp/snp.c,v 1.5 2003/07/19 21:14:28 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -255,8 +255,7 @@ snpread(dev, uio, flag)
 			if (flag & IO_NDELAY)
 				return (EWOULDBLOCK);
 			snp->snp_flags |= SNOOP_RWAIT;
-			error = tsleep((caddr_t)snp, (PZERO + 1) | PCATCH,
-			    "snprd", 0);
+			error = tsleep((caddr_t)snp, PCATCH, "snprd", 0);
 			if (error != 0)
 				return (error);
 		}
diff --git a/sys/dev/misc/spic/spic.c b/sys/dev/misc/spic/spic.c
index 1c8a796075..51aa6caa96 100644
--- a/sys/dev/misc/spic/spic.c
+++ b/sys/dev/misc/spic/spic.c
@@ -48,7 +48,7 @@
  * also provided sample code upon which this driver was based.
  *
  * $FreeBSD: src/sys/i386/isa/spic.c,v 1.4.2.1 2002/04/15 00:52:12 will Exp $
- * $DragonFly: src/sys/dev/misc/spic/spic.c,v 1.2 2003/06/17 04:28:37 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/spic/spic.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -492,7 +492,7 @@ spicread(dev_t dev, struct uio *uio, int flag)
 	s = spltty();
 	while (!(sc->sc_count)) {
 		sc->sc_sleeping=1;
-		error = tsleep((caddr_t) sc, PZERO | PCATCH, "jogrea", 0);
+		error = tsleep((caddr_t) sc, PCATCH, "jogrea", 0);
 		sc->sc_sleeping=0;
 		if (error) {
 			splx(s);
diff --git a/sys/dev/misc/syscons/syscons.c b/sys/dev/misc/syscons/syscons.c
index 169ede8f1b..a2392ae461 100644
--- a/sys/dev/misc/syscons/syscons.c
+++ b/sys/dev/misc/syscons/syscons.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.336.2.15 2002/10/24 00:35:31 kbyanc Exp $
- * $DragonFly: src/sys/dev/misc/syscons/syscons.c,v 1.4 2003/06/25 03:55:50 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/syscons.c,v 1.5 2003/07/19 21:14:29 dillon Exp $
  */
 
 #include "splash.h"
@@ -957,7 +957,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 	scp = SC_STAT(SC_DEV(sc, i));
 	if (scp == scp->sc->cur_scp)
 	    return 0;
-	while ((error=tsleep((caddr_t)&scp->smode, PZERO|PCATCH,
+	while ((error=tsleep((caddr_t)&scp->smode, PCATCH,
 			     "waitvt", 0)) == ERESTART) ;
 	return error;
 
@@ -2040,7 +2040,7 @@ wait_scrn_saver_stop(sc_softc_t *sc)
 	    error = 0;
 	    break;
 	}
-	error = tsleep((caddr_t)&scrn_blanked, PZERO | PCATCH, "scrsav", 0);
+	error = tsleep((caddr_t)&scrn_blanked, PCATCH, "scrsav", 0);
 	if ((error != 0) && (error != ERESTART))
 	    break;
     }
diff --git a/sys/dev/misc/tw/tw.c b/sys/dev/misc/tw/tw.c
index 7ff3e46850..2224887d2e 100644
--- a/sys/dev/misc/tw/tw.c
+++ b/sys/dev/misc/tw/tw.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/tw.c,v 1.38 2000/01/29 16:00:32 peter Exp $
- * $DragonFly: src/sys/dev/misc/tw/tw.c,v 1.2 2003/06/17 04:28:37 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/tw/tw.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  *
  */
 
@@ -201,8 +201,6 @@
  */
 
 #define	TWUNIT(dev)	(minor(dev))	/* Extract unit number from device */
-#define TWPRI		(PZERO+8)	/* I don't know any better, so let's */
-					/* use the same as the line printer */
 
 static int twprobe(struct isa_device *idp);
 static int twattach(struct isa_device *idp);
@@ -513,7 +511,7 @@ int twwrite(dev, uio, ioflag)
    * originated locally.
    */
   while(sc->sc_state & (TWS_RCVING | TWS_XMITTING)) {
-    error = tsleep((caddr_t)sc, TWPRI|PCATCH, "twwrite", 0);
+    error = tsleep((caddr_t)sc, PCATCH, "twwrite", 0);
     if(error) {
       splx(s);
       return(error);
@@ -865,7 +863,7 @@ int cnt;
   while(cnt--) {
     while(sc->sc_nextin == sc->sc_nextout) {  /* Buffer empty */
       sc->sc_state |= TWS_WANT;
-      error = tsleep((caddr_t)(&sc->sc_buf), TWPRI|PCATCH, "twread", 0);
+      error = tsleep((caddr_t)(&sc->sc_buf), PCATCH, "twread", 0);
       if(error) {
 	return(error);
       }
diff --git a/sys/dev/netif/an/if_an.c b/sys/dev/netif/an/if_an.c
index 2ebbf6599e..65fd9e7218 100644
--- a/sys/dev/netif/an/if_an.c
+++ b/sys/dev/netif/an/if_an.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.4 2003/06/25 03:55:45 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.5 2003/07/19 21:14:17 dillon Exp $
  *
  * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $
  */
@@ -3330,7 +3330,7 @@ writerids(ifp, l_ioctl)
  * Linux driver
  */
 
-#define FLASH_DELAY(x)	tsleep(ifp, PZERO, "flash", ((x) / hz) + 1);
+#define FLASH_DELAY(x)	tsleep(ifp, 0, "flash", ((x) / hz) + 1);
 #define FLASH_COMMAND	0x7e7e
 #define FLASH_SIZE	32 * 1024
 
diff --git a/sys/dev/netif/awi/awi.c b/sys/dev/netif/awi/awi.c
index 7294ac0f4d..8aa6b94300 100644
--- a/sys/dev/netif/awi/awi.c
+++ b/sys/dev/netif/awi/awi.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $	*/
 /* $FreeBSD: src/sys/dev/awi/awi.c,v 1.10.2.2 2003/01/23 21:06:42 sam Exp $ */
-/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.4 2003/06/25 03:55:46 dillon Exp $ */
+/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.5 2003/07/19 21:14:18 dillon Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -373,7 +373,7 @@ awi_detach(sc)
 	awi_stop(sc);
 	while (sc->sc_sleep_cnt > 0) {
 		wakeup(sc);
-		(void)tsleep(sc, PWAIT, "awidet", 1);
+		(void)tsleep(sc, 0, "awidet", 1);
 	}
 	if (sc->sc_wep_ctx != NULL)
 		free(sc->sc_wep_ctx, M_DEVBUF);
@@ -1471,7 +1471,7 @@ awi_init_hw(sc)
 			break;
 		if (sc->sc_cansleep) {
 			sc->sc_sleep_cnt++;
-			(void)tsleep(sc, PWAIT, "awitst", 1);
+			(void)tsleep(sc, 0, "awitst", 1);
 			sc->sc_sleep_cnt--;
 		} else {
 			DELAY(1000*1000/hz);
@@ -2595,7 +2595,7 @@ awi_lock(sc)
 		if (sc->sc_invalid)
 			return ENXIO;
 		sc->sc_sleep_cnt++;
-		error = tsleep(sc, PWAIT | PCATCH, "awilck", 0);
+		error = tsleep(sc, PCATCH, "awilck", 0);
 		sc->sc_sleep_cnt--;
 		if (error)
 			return error;
@@ -2672,7 +2672,7 @@ awi_cmd_wait(sc)
 		}
 		if (sc->sc_cansleep) {
 			sc->sc_sleep_cnt++;
-			error = tsleep(sc, PWAIT, "awicmd",
+			error = tsleep(sc, 0, "awicmd",
 			    AWI_CMD_TIMEOUT*hz/1000);
 			sc->sc_sleep_cnt--;
 		} else {
diff --git a/sys/dev/netif/cx/cx.c b/sys/dev/netif/cx/cx.c
index 37958b89f8..9ca6f21c3a 100644
--- a/sys/dev/netif/cx/cx.c
+++ b/sys/dev/netif/cx/cx.c
@@ -16,7 +16,7 @@
  * Version 1.9, Wed Oct  4 18:58:15 MSK 1995
  *
  * $FreeBSD: src/sys/i386/isa/cx.c,v 1.45.2.1 2001/02/26 04:23:09 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/cx/cx.c,v 1.3 2003/06/25 03:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/cx/cx.c,v 1.4 2003/07/19 21:14:34 dillon Exp $
  *
  */
 #undef DEBUG
@@ -232,7 +232,7 @@ int cxopen (dev_t dev, int flag, int mode, struct thread *td)
 		 * waiting for carrier. */
 		c->sopt.lock = 1;
 		while (!(tp->t_cflag & CLOCAL) && !(tp->t_state & TS_CARR_ON))
-			if ((error = tsleep (TSA_CARR_ON(tp), TTIPRI | PCATCH,
+			if ((error = tsleep (TSA_CARR_ON(tp), PCATCH,
 			    "cxdcd", 0)))
 				break;
 		c->sopt.lock = 0;       /* Unlock the channel. */
diff --git a/sys/dev/netif/ray/if_ray.c b/sys/dev/netif/ray/if_ray.c
index c03e644f40..4458be902d 100644
--- a/sys/dev/netif/ray/if_ray.c
+++ b/sys/dev/netif/ray/if_ray.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.47.2.4 2001/08/14 22:54:05 dmlb Exp $
- * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.2 2003/06/17 04:28:29 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.3 2003/07/19 21:14:26 dillon Exp $
  *
  */
 
@@ -3230,7 +3230,7 @@ ray_com_runq_add(struct ray_softc *sc, struct ray_comq_entry *com[], int ncom, c
 	ray_com_runq(sc);
 	if (TAILQ_FIRST(&sc->sc_comq) != NULL) {
 		RAY_DPRINTF(sc, RAY_DBG_COM, "sleeping");
-		error = tsleep(com[ncom-1], PCATCH | PRIBIO, wmesg, 0);
+		error = tsleep(com[ncom-1], PCATCH, wmesg, 0);
 		if (com[ncom-1]->c_flags & RAY_COM_FDETACHED)
 			return (ENXIO);
 		RAY_DPRINTF(sc, RAY_DBG_COM,
@@ -3474,8 +3474,7 @@ ray_ccs_alloc(struct ray_softc *sc, size_t *ccsp, char *wmesg)
 		}
 		if (i > RAY_CCS_CMD_LAST) {
 			RAY_DPRINTF(sc, RAY_DBG_CCS, "sleeping");
-			error = tsleep(ray_ccs_alloc, PCATCH | PRIBIO,
-			    wmesg, 0);
+			error = tsleep(ray_ccs_alloc, PCATCH, wmesg, 0);
 			if ((sc == NULL) || (sc->sc_gone))
 				return (ENXIO);
 			RAY_DPRINTF(sc, RAY_DBG_CCS,
diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c
index dca68db031..ac667e60f2 100644
--- a/sys/dev/netif/sbsh/if_sbsh.c
+++ b/sys/dev/netif/sbsh/if_sbsh.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.3.2.1 2003/04/15 18:15:07 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.4 2003/06/25 03:55:48 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.5 2003/07/19 21:14:27 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -940,14 +940,14 @@ start_cx28975(struct sbsh_softc *sc, struct cx28975_cfg cfg)
 	if (cfg.wburst)
 		sc->regs->CRB |= WTBE;
 
-	tsleep(sc, PWAIT, "sbsh", 0);
+	tsleep(sc, 0, "sbsh", 0);
 	if ((p->out_ack & 0x1f) != _ACK_BOOT_WAKE_UP)
 		return (-1);
 
 	if (download_firmware(sc, cfg.firmw_image, cfg.firmw_len))
 		return (-1);
 
-	tsleep(sc, PWAIT, "sbsh", 0);
+	tsleep(sc, 0, "sbsh", 0);
 	if ((p->out_ack & 0x1f) != _ACK_OPER_WAKE_UP)
 		return (-1);
 
@@ -1056,7 +1056,7 @@ issue_cx28975_cmd(struct sbsh_softc *sc, u_int8_t cmd,
 	p->out_ack	= _ACK_NOT_COMPLETE;
 	p->intr_8051	= 0xfe;
 
-	if (tsleep(sc, PWAIT, "sbsh", hz << 3))
+	if (tsleep(sc, 0, "sbsh", hz << 3))
 		return (-1);
 
 	while (p->out_ack == _ACK_NOT_COMPLETE)
diff --git a/sys/dev/powermng/i386/intpm/intpm.c b/sys/dev/powermng/i386/intpm/intpm.c
index 0e004eba90..34cbee069a 100644
--- a/sys/dev/powermng/i386/intpm/intpm.c
+++ b/sys/dev/powermng/i386/intpm/intpm.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/intpm.c,v 1.16.2.1 2001/12/23 08:17:47 pirzyk Exp $
- * $DragonFly: src/sys/dev/powermng/i386/intpm/intpm.c,v 1.2 2003/06/17 04:28:57 dillon Exp $
+ * $DragonFly: src/sys/dev/powermng/i386/intpm/intpm.c,v 1.3 2003/07/19 21:14:49 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -385,7 +385,7 @@ intsmb_stop(device_t dev){
 		error=intsmb_stop_poll(dev);
 		return error;
 	}else{
-		if(!tsleep(sc,(PWAIT)|PCATCH,"SMBWAI",hz/8)){
+		if(!tsleep(sc, PCATCH, "SMBWAI", hz/8)){
 			int status;
 			status=bus_space_read_1(sc->st,sc->sh,PIIX4_SMBHSTSTS);
 			if(!(status&PIIX4_SMBHSTSTAT_BUSY)){
diff --git a/sys/dev/powermng/ichsmb/ichsmb.c b/sys/dev/powermng/ichsmb/ichsmb.c
index 040edd7cca..88d84a0577 100644
--- a/sys/dev/powermng/ichsmb/ichsmb.c
+++ b/sys/dev/powermng/ichsmb/ichsmb.c
@@ -37,7 +37,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $FreeBSD: src/sys/dev/ichsmb/ichsmb.c,v 1.1.2.1 2000/10/09 00:52:43 archie Exp $
- * $DragonFly: src/sys/dev/powermng/ichsmb/ichsmb.c,v 1.2 2003/06/17 04:28:27 dillon Exp $
+ * $DragonFly: src/sys/dev/powermng/ichsmb/ichsmb.c,v 1.3 2003/07/19 21:14:21 dillon Exp $
  */
 
 /*
@@ -633,7 +633,7 @@ ichsmb_wait(sc_p sc)
 	KASSERT(sc->ich_cmd != -1,
 	    ("%s: ich_cmd=%d\n", __FUNCTION__ , sc->ich_cmd));
 sleep:
-	error = tsleep(sc, PZERO | PCATCH, "ichsmb", hz / 4);
+	error = tsleep(sc, PCATCH, "ichsmb", hz / 4);
 	DBG("tsleep -> %d\n", error);
 	switch (error) {
 	case ERESTART:
diff --git a/sys/dev/raid/aac/aac.c b/sys/dev/raid/aac/aac.c
index 2b32cda668..c73456f905 100644
--- a/sys/dev/raid/aac/aac.c
+++ b/sys/dev/raid/aac/aac.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/aac/aac.c,v 1.9.2.14 2003/04/08 13:22:08 scottl Exp $
- *	$DragonFly: src/sys/dev/raid/aac/aac.c,v 1.4 2003/07/06 21:23:47 dillon Exp $
+ *	$DragonFly: src/sys/dev/raid/aac/aac.c,v 1.5 2003/07/19 21:14:16 dillon Exp $
  */
 
 /*
@@ -491,7 +491,7 @@ aac_detach(device_t dev)
 	if (sc->aifflags & AAC_AIFFLAGS_RUNNING) {
 		sc->aifflags |= AAC_AIFFLAGS_EXIT;
 		wakeup(sc->aifthread);
-		tsleep(sc->aac_dev, PUSER | PCATCH, "aacdch", 30 * hz);
+		tsleep(sc->aac_dev, PCATCH, "aacdch", 30 * hz);
 	}
 
 	if (sc->aifflags & AAC_AIFFLAGS_RUNNING)
@@ -741,7 +741,7 @@ aac_host_command(struct aac_softc *sc)
 
 	while (!(sc->aifflags & AAC_AIFFLAGS_EXIT)) {
 		if (!(sc->aifflags & AAC_AIFFLAGS_PENDING))
-			tsleep(sc->aifthread, PRIBIO, "aifthd", 15 * hz);
+			tsleep(sc->aifthread, 0, "aifthd", 15 * hz);
 
 		sc->aifflags &= ~AAC_AIFFLAGS_PENDING;
 		for (;;) {
@@ -1119,7 +1119,7 @@ aac_wait_command(struct aac_command *cm, int timeout)
 	aac_startio(cm->cm_sc);
 	s = splbio();
 	while (!(cm->cm_flags & AAC_CMD_COMPLETED) && (error != EWOULDBLOCK)) {
-		error = tsleep(cm, PRIBIO, "aacwait", 0);
+		error = tsleep(cm, 0, "aacwait", 0);
 	}
 	splx(s);
 	return(error);
@@ -2756,7 +2756,7 @@ aac_getnext_aif(struct aac_softc *sc, caddr_t arg)
 			if ((error == EAGAIN) && (agf.Wait)) {
 				sc->aac_state |= AAC_STATE_AIF_SLEEPER;
 				while (error == EAGAIN) {
-					error = tsleep(sc->aac_aifq, PRIBIO |
+					error = tsleep(sc->aac_aifq,
 						       PCATCH, "aacaif", 0);
 					if (error == 0)
 						error = aac_return_aif(sc,
diff --git a/sys/dev/raid/amr/amr.c b/sys/dev/raid/amr/amr.c
index 3212aab775..ad50cc7c08 100644
--- a/sys/dev/raid/amr/amr.c
+++ b/sys/dev/raid/amr/amr.c
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/amr/amr.c,v 1.7.2.13 2003/01/15 13:41:18 emoore Exp $
- *	$DragonFly: src/sys/dev/raid/amr/amr.c,v 1.2 2003/06/17 04:28:22 dillon Exp $
+ *	$DragonFly: src/sys/dev/raid/amr/amr.c,v 1.3 2003/07/19 21:14:17 dillon Exp $
  */
 
 /*
@@ -928,7 +928,7 @@ amr_wait_command(struct amr_command *ac)
     count = 0;
     /* XXX better timeout? */
     while ((ac->ac_flags & AMR_CMD_BUSY) && (count < 30)) {
-	tsleep(ac, PRIBIO | PCATCH, "amrwcmd", hz);
+	tsleep(ac, PCATCH, "amrwcmd", hz);
     }
     return(0);
 }
@@ -988,7 +988,7 @@ amr_quartz_poll_command(struct amr_command *ac)
 
     count=0;
     while (sc->amr_busyslots){
-	tsleep(sc, PRIBIO | PCATCH, "amrpoll", hz);
+	tsleep(sc, PCATCH, "amrpoll", hz);
 	if(count++>10) {
 	    break;
 	}
diff --git a/sys/dev/raid/asr/asr.c b/sys/dev/raid/asr/asr.c
index a4d14b0e9a..1a70edae7b 100644
--- a/sys/dev/raid/asr/asr.c
+++ b/sys/dev/raid/asr/asr.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/asr/asr.c,v 1.3.2.2 2001/08/23 05:21:29 scottl Exp $ */
-/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.5 2003/06/25 03:55:46 dillon Exp $ */
+/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.6 2003/07/19 21:14:17 dillon Exp $ */
 /*
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000-2001 Adaptec Corporation
@@ -4318,8 +4318,7 @@ ASR_queue_i(
                         return (EIO);
                 }
                 /* Check every second for BlinkLed */
-                /* There is no PRICAM, but outwardly PRIBIO is functional */
-                tsleep((caddr_t)ccb, PRIBIO, "asr", hz);
+                tsleep((caddr_t)ccb, 0, "asr", hz);
         }
         splx(s);
 
diff --git a/sys/dev/raid/dpt/dpt_scsi.c b/sys/dev/raid/dpt/dpt_scsi.c
index 04f19d151c..121c63d8fe 100644
--- a/sys/dev/raid/dpt/dpt_scsi.c
+++ b/sys/dev/raid/dpt/dpt_scsi.c
@@ -44,7 +44,7 @@
  */
 
 #ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.28.2.3 2003/01/31 02:47:10 grog Exp $"
-#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_scsi.c,v 1.2 2003/06/17 04:28:23 dillon Exp $"
+#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_scsi.c,v 1.3 2003/07/19 21:14:20 dillon Exp $"
 
 #define _DPT_C_
 
@@ -2374,8 +2374,7 @@ dpt_user_cmd(dpt_softc_t * dpt, eata_pt_t * user_cmd,
 		splx(ospl);
 
 		while ((submitted = dpt->submitted_ccbs_count) != 0) {
-			huh = tsleep((void *) dpt, PCATCH | PRIBIO, "dptqt",
-				     100 * hz);
+			huh = tsleep((void *) dpt, PCATCH, "dptqt", 100 * hz);
 			switch (huh) {
 			case 0:
 				/* Wakeup call received */
@@ -2420,7 +2419,7 @@ dpt_user_cmd(dpt_softc_t * dpt, eata_pt_t * user_cmd,
 	dpt_sched_queue(dpt);
 
 	/* Wait for the command to complete */
-	(void) tsleep((void *) ccb, PCATCH | PRIBIO, "dptucw", 100 * hz);
+	(void) tsleep((void *) ccb, PCATCH, "dptucw", 100 * hz);
 
 	/* Free allocated memory */
 	if (data != NULL)
diff --git a/sys/dev/raid/ida/ida.c b/sys/dev/raid/ida/ida.c
index e1118686fa..ba34a61832 100644
--- a/sys/dev/raid/ida/ida.c
+++ b/sys/dev/raid/ida/ida.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ida/ida.c,v 1.7.2.3 2001/03/01 01:57:32 ps Exp $
- * $DragonFly: src/sys/dev/raid/ida/ida.c,v 1.3 2003/06/23 17:55:31 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/ida/ida.c,v 1.4 2003/07/19 21:14:22 dillon Exp $
  */
 
 /*
@@ -451,7 +451,7 @@ ida_wait(struct ida_softc *ida, struct ida_qcb *qcb)
 	int delay;
 
 	if (ida->flags & IDA_INTERRUPTS) {
-		if (tsleep((caddr_t)qcb, PRIBIO, "idacmd", 5 * hz))
+		if (tsleep((caddr_t)qcb, 0, "idacmd", 5 * hz))
 			return (ETIMEDOUT);
 		return (0);
 	}
diff --git a/sys/dev/raid/iir/iir.c b/sys/dev/raid/iir/iir.c
index ccb30ff44d..c04677c6e4 100644
--- a/sys/dev/raid/iir/iir.c
+++ b/sys/dev/raid/iir/iir.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/iir/iir.c,v 1.2.2.3 2002/05/05 08:18:12 asmodai Exp $ */
-/* $DragonFly: src/sys/dev/raid/iir/iir.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ */
+/* $DragonFly: src/sys/dev/raid/iir/iir.c,v 1.3 2003/07/19 21:14:22 dillon Exp $ */
 /*
  *       Copyright (c) 2000-01 Intel Corporation
  *       All Rights Reserved
@@ -1536,7 +1536,7 @@ iir_shutdown( void *arg, int howto )
     gdt->sc_state = GDT_SHUTDOWN;
     splx(lock);
     if ((gccb = SLIST_FIRST(&gdt->sc_pending_gccb)) != NULL)
-        (void) tsleep((void *)gccb, PCATCH | PRIBIO, "iirshw", 100 * hz);
+        (void) tsleep((void *)gccb, PCATCH, "iirshw", 100 * hz);
 
     /* flush */
     for (i = 0; i < GDT_MAX_HDRIVES; ++i) {
@@ -1550,7 +1550,7 @@ iir_shutdown( void *arg, int howto )
             splx(lock);
             gdt_next(gdt);
             if (!ucmd->complete_flag)
-                (void) tsleep((void *)ucmd, PCATCH|PRIBIO, "iirshw", 10*hz);
+                (void) tsleep((void *)ucmd, PCATCH, "iirshw", 10*hz);
         }
     }
 
diff --git a/sys/dev/raid/iir/iir_ctrl.c b/sys/dev/raid/iir/iir_ctrl.c
index 32dd112ad5..cf1de3cc51 100644
--- a/sys/dev/raid/iir/iir_ctrl.c
+++ b/sys/dev/raid/iir/iir_ctrl.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.2.2.4 2002/05/05 08:18:12 asmodai Exp $ */
-/* $DragonFly: src/sys/dev/raid/iir/iir_ctrl.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ */
+/* $DragonFly: src/sys/dev/raid/iir/iir_ctrl.c,v 1.3 2003/07/19 21:14:22 dillon Exp $ */
 /*
  *       Copyright (c) 2000-01 Intel Corporation
  *       All Rights Reserved
@@ -259,7 +259,7 @@ iir_ioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, d_thread_t * p)
             splx(lock);
             gdt_next(gdt);
             if (!ucmd->complete_flag)
-                (void) tsleep((void *)ucmd, PCATCH | PRIBIO, "iirucw", 0);
+                (void) tsleep((void *)ucmd, PCATCH, "iirucw", 0);
             break;
         }
 
diff --git a/sys/dev/raid/mlx/mlx.c b/sys/dev/raid/mlx/mlx.c
index 775cab0cdc..d51fb5785e 100644
--- a/sys/dev/raid/mlx/mlx.c
+++ b/sys/dev/raid/mlx/mlx.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/mlx/mlx.c,v 1.14.2.5 2001/09/11 09:49:53 kris Exp $
- *	$DragonFly: src/sys/dev/raid/mlx/mlx.c,v 1.3 2003/06/23 17:55:32 dillon Exp $
+ *	$DragonFly: src/sys/dev/raid/mlx/mlx.c,v 1.4 2003/07/19 21:14:24 dillon Exp $
  */
 
 /*
@@ -1667,7 +1667,7 @@ mlx_wait_command(struct mlx_command *mc)
     count = 0;
     /* XXX better timeout? */
     while ((mc->mc_status == MLX_STATUS_BUSY) && (count < 30)) {
-	tsleep(mc->mc_private, PRIBIO | PCATCH, "mlxwcmd", hz);
+	tsleep(mc->mc_private, PCATCH, "mlxwcmd", hz);
     }
 
     if (mc->mc_status != 0) {
diff --git a/sys/dev/raid/mly/mly.c b/sys/dev/raid/mly/mly.c
index 16a1c67169..2240833247 100644
--- a/sys/dev/raid/mly/mly.c
+++ b/sys/dev/raid/mly/mly.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/mly/mly.c,v 1.3.2.3 2001/03/05 20:17:24 msmith Exp $
- *	$DragonFly: src/sys/dev/raid/mly/mly.c,v 1.3 2003/06/23 17:55:32 dillon Exp $
+ *	$DragonFly: src/sys/dev/raid/mly/mly.c,v 1.4 2003/07/19 21:14:24 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -846,7 +846,7 @@ mly_immediate_command(struct mly_command *mc)
     if (sc->mly_state & MLY_STATE_INTERRUPTS_ON) {
 	/* sleep on the command */
 	while(!(mc->mc_flags & MLY_CMD_COMPLETE)) {
-	    tsleep(mc, PRIBIO, "mlywait", 0);
+	    tsleep(mc, 0, "mlywait", 0);
 	}
     } else {
 	/* spin and collect status while we do */
@@ -1804,7 +1804,7 @@ mly_user_command(struct mly_softc *sc, struct mly_user_command *uc)
     mly_requeue_ready(mc);
     mly_startio(sc);
     while (!(mc->mc_flags & MLY_CMD_COMPLETE))
-	tsleep(mc, PRIBIO, "mlyioctl", 0);
+	tsleep(mc, 0, "mlyioctl", 0);
     splx(s);
 
     /* return the data to userspace */
@@ -1853,7 +1853,7 @@ mly_user_health(struct mly_softc *sc, struct mly_user_health *uh)
     s = splcam();
     error = EWOULDBLOCK;
     while ((error != 0) && (sc->mly_event_change == mh.change_counter))
-	error = tsleep(&sc->mly_event_change, PRIBIO | PCATCH, "mlyhealth", 0);
+	error = tsleep(&sc->mly_event_change, PCATCH, "mlyhealth", 0);
     splx(s);
     
     /* copy the controller's health status buffer out (there is a race here if it changes again) */
diff --git a/sys/dev/raid/twe/twe.c b/sys/dev/raid/twe/twe.c
index fbe0a5580e..bff7c3ec76 100644
--- a/sys/dev/raid/twe/twe.c
+++ b/sys/dev/raid/twe/twe.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/twe/twe.c,v 1.1.2.6 2002/03/07 09:57:02 msmith Exp $
- *	$DragonFly: src/sys/dev/raid/twe/twe.c,v 1.2 2003/06/17 04:28:32 dillon Exp $
+ *	$DragonFly: src/sys/dev/raid/twe/twe.c,v 1.3 2003/07/19 21:14:29 dillon Exp $
  */
 
 /*
@@ -535,7 +535,7 @@ twe_ioctl(struct twe_softc *sc, int cmd, void *addr)
     case TWEIO_AEN_WAIT:
 	s = splbio();
 	while ((*arg = twe_dequeue_aen(sc)) == -1) {
-	    error = tsleep(&sc->twe_aen_queue, PRIBIO | PCATCH, "tweaen", 0);
+	    error = tsleep(&sc->twe_aen_queue, PCATCH, "tweaen", 0);
 	    if (error == EINTR)
 		break;
 	}
@@ -867,7 +867,7 @@ twe_wait_request(struct twe_request *tr)
     twe_startio(tr->tr_sc);
     s = splbio();
     while (tr->tr_status == TWE_CMD_BUSY)
-	tsleep(tr, PRIBIO, "twewait", 0);
+	tsleep(tr, 0, "twewait", 0);
     splx(s);
     
     return(0);
@@ -932,7 +932,7 @@ twe_reset(struct twe_softc *sc)
     /*
      * Sleep for a short period to allow AENs to be signalled.
      */
-    tsleep(NULL, PRIBIO, "twereset", hz);
+    tsleep(NULL, 0, "twereset", hz);
 
     /*
      * Disable interrupts from the controller, and mask any accidental entry
@@ -1447,7 +1447,7 @@ twe_wait_aen(struct twe_softc *sc, int aen, int timeout)
     sc->twe_wait_aen = aen;
     do {
 	twe_fetch_aen(sc);
-	tsleep(&sc->twe_wait_aen, PZERO, "twewaen", hz);
+	tsleep(&sc->twe_wait_aen, 0, "twewaen", hz);
 	if (sc->twe_wait_aen == -1)
 	    found = 1;
     } while ((time_second <= expiry) && !found);
diff --git a/sys/dev/raid/vinum/vinum.c b/sys/dev/raid/vinum/vinum.c
index 5dc2eb0dc7..6256b9334f 100644
--- a/sys/dev/raid/vinum/vinum.c
+++ b/sys/dev/raid/vinum/vinum.c
@@ -37,7 +37,7 @@
  *
  * $Id: vinum.c,v 1.33 2001/01/09 06:19:15 grog Exp grog $
  * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.38.2.3 2003/01/07 12:14:16 joerg Exp $
- * $DragonFly: src/sys/dev/raid/vinum/vinum.c,v 1.4 2003/06/25 03:55:50 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/vinum/vinum.c,v 1.5 2003/07/19 21:14:31 dillon Exp $
  */
 
 #define STATIC static					    /* nothing while we're testing XXX */
@@ -210,7 +210,7 @@ free_vinum(int cleardrive)
     while ((vinum_conf.flags & (VF_STOPPING | VF_DAEMONOPEN))
 	== (VF_STOPPING | VF_DAEMONOPEN)) {		    /* at least one daemon open, we're stopping */
 	queue_daemon_request(daemonrq_return, (union daemoninfo) 0); /* stop the daemon */
-	tsleep(&vinumclose, PUSER, "vstop", 1);		    /* and wait for it */
+	tsleep(&vinumclose, 0, "vstop", 1);		    /* and wait for it */
     }
     if (SD != NULL)
 	Free(SD);
diff --git a/sys/dev/raid/vinum/vinumconfig.c b/sys/dev/raid/vinum/vinumconfig.c
index 5e4be84037..a35c9a0fcc 100644
--- a/sys/dev/raid/vinum/vinumconfig.c
+++ b/sys/dev/raid/vinum/vinumconfig.c
@@ -47,7 +47,7 @@
  *
  * $Id: vinumconfig.c,v 1.30 2000/05/01 09:45:50 grog Exp grog $
  * $FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.32.2.6 2002/02/03 00:43:35 grog Exp $
- * $DragonFly: src/sys/dev/raid/vinum/vinumconfig.c,v 1.2 2003/06/17 04:28:33 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/vinum/vinumconfig.c,v 1.3 2003/07/19 21:14:31 dillon Exp $
  */
 
 #define STATIC static
@@ -2024,7 +2024,7 @@ start_config(int force)
     current_volume = -1;				    /* and the last volume */
     while ((vinum_conf.flags & VF_CONFIGURING) != 0) {
 	vinum_conf.flags |= VF_WILL_CONFIGURE;
-	if ((error = tsleep(&vinum_conf, PRIBIO | PCATCH, "vincfg", 0)) != 0)
+	if ((error = tsleep(&vinum_conf, PCATCH, "vincfg", 0)) != 0)
 	    return error;
     }
     /*
diff --git a/sys/dev/raid/vinum/vinumdaemon.c b/sys/dev/raid/vinum/vinumdaemon.c
index 6e2125d69e..6237ba534d 100644
--- a/sys/dev/raid/vinum/vinumdaemon.c
+++ b/sys/dev/raid/vinum/vinumdaemon.c
@@ -36,7 +36,7 @@
  *
  * $Id: vinumdaemon.c,v 1.8 2000/01/03 05:22:03 grog Exp grog $
  * $FreeBSD: src/sys/dev/vinum/vinumdaemon.c,v 1.16 2000/01/05 06:03:56 grog Exp $
- * $DragonFly: src/sys/dev/raid/vinum/vinumdaemon.c,v 1.2 2003/06/17 04:28:33 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/vinum/vinumdaemon.c,v 1.3 2003/07/19 21:14:31 dillon Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
@@ -74,7 +74,7 @@ vinum_daemon(void)
     daemon_save_config();				    /* start by saving the configuration */
     daemonpid = curproc->p_pid;				    /* mark our territory */
     while (1) {
-	tsleep(&vinum_daemon, PRIBIO, "vinum", 0);	    /* wait for something to happen */
+	tsleep(&vinum_daemon, 0, "vinum", 0);	    /* wait for something to happen */
 
 	/*
 	 * It's conceivable that, as the result of an
@@ -260,7 +260,7 @@ vinum_finddaemon()
 
     if (daemonpid != 0) {				    /* we think we have a daemon, */
 	queue_daemon_request(daemonrq_ping, (union daemoninfo) NULL); /* queue a ping */
-	result = tsleep(&vinum_finddaemon, PUSER, "reap", 2 * hz);
+	result = tsleep(&vinum_finddaemon, 0, "reap", 2 * hz);
 	if (result == 0)				    /* yup, the daemon's up and running */
 	    return 0;
     }
diff --git a/sys/dev/raid/vinum/vinumlock.c b/sys/dev/raid/vinum/vinumlock.c
index 182f1b0bc5..afcca01d9e 100644
--- a/sys/dev/raid/vinum/vinumlock.c
+++ b/sys/dev/raid/vinum/vinumlock.c
@@ -39,7 +39,7 @@
  *
  * $Id: vinumlock.c,v 1.13 2000/05/02 23:25:02 grog Exp grog $
  * $FreeBSD: src/sys/dev/vinum/vinumlock.c,v 1.18.2.3 2001/04/04 06:27:11 grog Exp $
- * $DragonFly: src/sys/dev/raid/vinum/vinumlock.c,v 1.2 2003/06/17 04:28:33 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/vinum/vinumlock.c,v 1.3 2003/07/19 21:14:31 dillon Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
@@ -82,10 +82,7 @@ lockdrive(struct drive *drive)
 	 * Solve this by waiting on this function; the number
 	 * of conflicts is negligible.
 	 */
-	if ((error = tsleep(&lockdrive,
-		    PRIBIO,
-		    "vindrv",
-		    0)) != 0)
+	if ((error = tsleep(&lockdrive, 0, "vindrv", 0)) != 0)
 	    return error;
     }
     drive->flags |= VF_LOCKED;
@@ -142,7 +139,7 @@ lockrange(daddr_t stripe, struct buf *bp, struct plex *plex)
 
     /* Wait here if the table is full */
     while (plex->usedlocks == PLEX_LOCKS)		    /* all in use */
-	tsleep(&plex->usedlocks, PRIBIO, "vlock", 0);
+	tsleep(&plex->usedlocks, 0, "vlock", 0);
 
 #ifdef DIAGNOSTIC
     if (plex->usedlocks >= PLEX_LOCKS)
@@ -169,7 +166,7 @@ lockrange(daddr_t stripe, struct buf *bp, struct plex *plex)
 		    }
 #endif
 		    plex->lockwaits++;			    /* waited one more time */
-		    tsleep(lock, PRIBIO, "vrlock", 0);
+		    tsleep(lock, 0, "vrlock", 0);
 		    lock = &plex->lock[-1];		    /* start again */
 		    foundlocks = 0;
 		    pos = NULL;
@@ -235,7 +232,7 @@ lock_config(void)
 
     while ((vinum_conf.flags & VF_LOCKED) != 0) {
 	vinum_conf.flags |= VF_LOCKING;
-	if ((error = tsleep(&vinum_conf, PRIBIO, "vincfg", 0)) != 0)
+	if ((error = tsleep(&vinum_conf, 0, "vincfg", 0)) != 0)
 	    return error;
     }
     vinum_conf.flags |= VF_LOCKED;
diff --git a/sys/dev/serial/cy/cy.c b/sys/dev/serial/cy/cy.c
index b0ebe42730..9db9c4ea79 100644
--- a/sys/dev/serial/cy/cy.c
+++ b/sys/dev/serial/cy/cy.c
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/cy.c,v 1.97.2.2 2001/08/22 13:04:58 bde Exp $
- * $DragonFly: src/sys/dev/serial/cy/cy.c,v 1.3 2003/06/25 03:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/serial/cy/cy.c,v 1.4 2003/07/19 21:14:34 dillon Exp $
  */
 
 #include "opt_compat.h"
@@ -680,7 +680,7 @@ sioopen(dev_t dev; int flag; int mode; struct thread *td)
 	 */
 open_top:
 	while (com->state & CS_DTR_OFF) {
-		error = tsleep(&com->dtr_wait, TTIPRI | PCATCH, "cydtr", 0);
+		error = tsleep(&com->dtr_wait, PCATCH, "cydtr", 0);
 		if (error != 0)
 			goto out;
 	}
@@ -701,7 +701,7 @@ open_top:
 					goto out;
 				}
 				error =	tsleep(&com->active_out,
-					       TTIPRI | PCATCH, "cybi", 0);
+					       PCATCH, "cybi", 0);
 				if (error != 0)
 					goto out;
 				goto open_top;
@@ -814,7 +814,7 @@ open_top:
 	if (!(tp->t_state & TS_CARR_ON) && !(mynor & CALLOUT_MASK)
 	    && !(tp->t_cflag & CLOCAL) && !(flag & O_NONBLOCK)) {
 		++com->wopeners;
-		error = tsleep(TSA_CARR_ON(tp), TTIPRI | PCATCH, "cydcd", 0);
+		error = tsleep(TSA_CARR_ON(tp), PCATCH, "cydcd", 0);
 		--com->wopeners;
 		if (error != 0)
 			goto out;
@@ -2764,7 +2764,7 @@ cd_etc(com, etc)
 	enable_intr();
 wait:
 	while (com->etc == etc
-	       && tsleep(&com->etc, TTIPRI | PCATCH, "cyetc", 0) == 0)
+	       && tsleep(&com->etc, PCATCH, "cyetc", 0) == 0)
 		continue;
 }
 
diff --git a/sys/dev/serial/dgb/dgm.c b/sys/dev/serial/dgb/dgm.c
index 616771a50b..9dcf2c20be 100644
--- a/sys/dev/serial/dgb/dgm.c
+++ b/sys/dev/serial/dgb/dgm.c
@@ -1,6 +1,6 @@
 /*-
  * $FreeBSD: src/sys/dev/dgb/dgm.c,v 1.31.2.3 2001/10/07 09:02:25 brian Exp $
- * $DragonFly: src/sys/dev/serial/dgb/dgm.c,v 1.3 2003/06/25 03:55:47 dillon Exp $
+ * $DragonFly: src/sys/dev/serial/dgb/dgm.c,v 1.4 2003/07/19 21:14:19 dillon Exp $
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
@@ -970,7 +970,7 @@ open_top:
 	s = spltty();
 
 	while (port->closing) {
-		error = tsleep(&port->closing, TTOPRI|PCATCH, "dgocl", 0);
+		error = tsleep(&port->closing, PCATCH, "dgocl", 0);
 
 		if (error) {
 			DPRINT4(DB_OPEN, "dgm%d: port%d: tsleep(dgocl)"
@@ -998,8 +998,7 @@ open_top:
 				    " BUSY error = %d\n", unit, pnum, error);
 				goto out;
 			}
-			error = tsleep(&port->active_out,
-			    TTIPRI | PCATCH, "dgmi", 0);
+			error = tsleep(&port->active_out, PCATCH, "dgmi", 0);
 			if (error != 0) {
 				DPRINT4(DB_OPEN, "dgm%d: port%d: tsleep(dgmi)"
 				    " error = %d\n", unit, pnum, error);
@@ -1063,7 +1062,7 @@ open_top:
 	if (!(tp->t_state & TS_CARR_ON) && !(mynor & CALLOUT_MASK)
 	    && !(tp->t_cflag & CLOCAL) && !(flag & O_NONBLOCK)) {
 		++port->wopeners;
-		error = tsleep(TSA_CARR_ON(tp), TTIPRI | PCATCH, "dgdcd", 0);
+		error = tsleep(TSA_CARR_ON(tp), PCATCH, "dgdcd", 0);
 		--port->wopeners;
 		if (error != 0) {
 			DPRINT4(DB_OPEN, "dgm%d: port%d: tsleep(dgdcd)"
@@ -1186,7 +1185,7 @@ dgmhardclose(struct dgm_p *port)
 	splx(cs);
 
 	timeout(dgm_pause, &port->brdchan, hz/2);
-	tsleep(&port->brdchan, TTIPRI | PCATCH, "dgclo", 0);
+	tsleep(&port->brdchan, PCATCH, "dgclo", 0);
 }
 
 static void
@@ -1804,7 +1803,7 @@ dgmdrain(struct dgm_p *port)
 		hidewin(sc);
 		port->draining = 1;
 		timeout(wakeflush, port, hz);
-		error = tsleep(&port->draining, TTIPRI | PCATCH, "dgdrn", 0);
+		error = tsleep(&port->draining, PCATCH, "dgdrn", 0);
 		port->draining = 0;
 		setwin(sc, 0);
 
@@ -1862,7 +1861,7 @@ dgm_drain_or_flush(struct dgm_p *port)
 		hidewin(sc);
 		port->draining = 1;
 		timeout(wakeflush, port, hz);
-		error = tsleep(&port->draining, TTIPRI | PCATCH, "dgfls", 0);
+		error = tsleep(&port->draining, PCATCH, "dgfls", 0);
 		port->draining = 0;
 		setwin(sc, 0);
 
diff --git a/sys/dev/serial/rc/rc.c b/sys/dev/serial/rc/rc.c
index 565d46257f..a13b43718f 100644
--- a/sys/dev/serial/rc/rc.c
+++ b/sys/dev/serial/rc/rc.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/rc.c,v 1.53.2.1 2001/02/26 04:23:10 jlemon Exp $
- * $DragonFly: src/sys/dev/serial/rc/rc.c,v 1.3 2003/06/25 03:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/serial/rc/rc.c,v 1.4 2003/07/19 21:14:34 dillon Exp $
  *
  */
 
@@ -737,7 +737,7 @@ rcopen(dev, flag, mode, p)
 
 again:
 	while (rc->rc_flags & RC_DTR_OFF) {
-		error = tsleep(&(rc->rc_dtrwait), TTIPRI | PCATCH, "rcdtr", 0);
+		error = tsleep(&(rc->rc_dtrwait), PCATCH, "rcdtr", 0);
 		if (error != 0)
 			goto out;
 	}
@@ -753,8 +753,7 @@ again:
 					error = EBUSY;
 					goto out;
 				}
-				error = tsleep(&rc->rc_rcb,
-				     TTIPRI|PCATCH, "rcbi", 0);
+				error = tsleep(&rc->rc_rcb, PCATCH, "rcbi", 0);
 				if (error)
 					goto out;
 				goto again;
@@ -787,7 +786,7 @@ again:
 	if (!(tp->t_state & TS_CARR_ON) && !CALLOUT(dev)
 	    && !(tp->t_cflag & CLOCAL) && !(flag & O_NONBLOCK)) {
 		rc->rc_dcdwaits++;
-		error = tsleep(TSA_CARR_ON(tp), TTIPRI | PCATCH, "rcdcd", 0);
+		error = tsleep(TSA_CARR_ON(tp), PCATCH, "rcdcd", 0);
 		rc->rc_dcdwaits--;
 		if (error != 0)
 			goto out;
diff --git a/sys/dev/serial/rp/rp.c b/sys/dev/serial/rp/rp.c
index bf85046f1b..596b371d73 100644
--- a/sys/dev/serial/rp/rp.c
+++ b/sys/dev/serial/rp/rp.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/rp/rp.c,v 1.45.2.2 2002/11/07 22:26:59 tegge Exp $
- * $DragonFly: src/sys/dev/serial/rp/rp.c,v 1.4 2003/06/25 03:55:48 dillon Exp $
+ * $DragonFly: src/sys/dev/serial/rp/rp.c,v 1.5 2003/07/19 21:14:27 dillon Exp $
  */
 
 /* 
@@ -982,7 +982,7 @@ rpopen(dev_t dev, int flag, int mode, d_thread_t *td)
 
 open_top:
 	while(rp->state & ~SET_DTR) {
-		error = tsleep(&rp->dtr_wait, TTIPRI | PCATCH, "rpdtr", 0);
+		error = tsleep(&rp->dtr_wait, PCATCH, "rpdtr", 0);
 		if(error != 0)
 			goto out;
 	}
@@ -1000,7 +1000,7 @@ open_top:
 					goto out;
 				}
 				error = tsleep(&rp->active_out,
-					TTIPRI | PCATCH, "rpbi", 0);
+					    PCATCH, "rpbi", 0);
 				if(error != 0)
 					goto out;
 				goto open_top;
@@ -1083,8 +1083,7 @@ open_top:
 	if(!(flag&O_NONBLOCK) && !(tp->t_cflag&CLOCAL) &&
 		!(tp->t_state & TS_CARR_ON) && !(IS_CALLOUT(dev))) {
 		++rp->wopeners;
-		error = tsleep(TSA_CARR_ON(tp), TTIPRI | PCATCH,
-				"rpdcd", 0);
+		error = tsleep(TSA_CARR_ON(tp), PCATCH, "rpdcd", 0);
 		--rp->wopeners;
 		if(error != 0)
 			goto out;
@@ -1203,7 +1202,7 @@ rpwrite(dev, uio, flag)
 	tp = rp->rp_tty;
 	while(rp->rp_disable_writes) {
 		rp->rp_waiting = 1;
-		error = ttysleep(tp, (caddr_t)rp, TTOPRI|PCATCH, "rp_write", 0);
+		error = ttysleep(tp, (caddr_t)rp, PCATCH, "rp_write", 0);
 		if (error)
 			return(error);
 	}
diff --git a/sys/dev/serial/rp2/rp.c b/sys/dev/serial/rp2/rp.c
index c95e538b2a..bd38510e58 100644
--- a/sys/dev/serial/rp2/rp.c
+++ b/sys/dev/serial/rp2/rp.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/rp.c,v 1.33.2.2 2001/02/26 04:23:10 jlemon Exp $
- * $DragonFly: src/sys/dev/serial/rp2/Attic/rp.c,v 1.3 2003/06/25 03:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/serial/rp2/Attic/rp.c,v 1.4 2003/07/19 21:14:34 dillon Exp $
  */
 
 /* 
@@ -1308,7 +1308,7 @@ rpopen(dev, flag, mode, p)
 
 open_top:
 	while(rp->state & ~SET_DTR) {
-		error = tsleep(&rp->dtr_wait, TTIPRI | PCATCH, "rpdtr", 0);
+		error = tsleep(&rp->dtr_wait, PCATCH, "rpdtr", 0);
 		if(error != 0)
 			goto out;
 	}
@@ -1326,7 +1326,7 @@ open_top:
 					goto out;
 				}
 				error = tsleep(&rp->active_out,
-					TTIPRI | PCATCH, "rpbi", 0);
+					    PCATCH, "rpbi", 0);
 				if(error != 0)
 					goto out;
 				goto open_top;
@@ -1406,8 +1406,7 @@ open_top:
 	if(!(flag&O_NONBLOCK) && !(tp->t_cflag&CLOCAL) &&
 		!(tp->t_state & TS_CARR_ON) && !(IS_CALLOUT(dev))) {
 		++rp->wopeners;
-		error = tsleep(TSA_CARR_ON(tp), TTIPRI | PCATCH,
-				"rpdcd", 0);
+		error = tsleep(TSA_CARR_ON(tp), PCATCH, "rpdcd", 0);
 		--rp->wopeners;
 		if(error != 0)
 			goto out;
@@ -1524,7 +1523,7 @@ rpwrite(dev, uio, flag)
 	tp = rp->rp_tty;
 	while(rp->rp_disable_writes) {
 		rp->rp_waiting = 1;
-		error = ttysleep(tp, (caddr_t)rp, TTOPRI|PCATCH, "rp_write", 0);
+		error = ttysleep(tp, (caddr_t)rp, PCATCH, "rp_write", 0);
 		if (error)
 			return(error);
 	}
diff --git a/sys/dev/serial/si/si.c b/sys/dev/serial/si/si.c
index 628bbb438f..bb23c283bb 100644
--- a/sys/dev/serial/si/si.c
+++ b/sys/dev/serial/si/si.c
@@ -31,7 +31,7 @@
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
  * $FreeBSD: src/sys/dev/si/si.c,v 1.101.2.1 2001/02/26 04:23:06 jlemon Exp $
- * $DragonFly: src/sys/dev/serial/si/si.c,v 1.3 2003/06/25 03:55:49 dillon Exp $
+ * $DragonFly: src/sys/dev/serial/si/si.c,v 1.4 2003/07/19 21:14:27 dillon Exp $
  */
 
 #ifndef lint
@@ -675,7 +675,7 @@ siopen(dev_t dev, int flag, int mode, struct thread *td)
 
 open_top:
 	while (pp->sp_state & SS_DTR_OFF) {
-		error = tsleep(&pp->sp_dtr_wait, TTIPRI|PCATCH, "sidtr", 0);
+		error = tsleep(&pp->sp_dtr_wait, PCATCH, "sidtr", 0);
 		if (error != 0)
 			goto out;
 	}
@@ -697,7 +697,7 @@ open_top:
 					goto out;
 				}
 				error = tsleep(&pp->sp_active_out,
-						TTIPRI|PCATCH, "sibi", 0);
+						PCATCH, "sibi", 0);
 				if (error != 0)
 					goto out;
 				goto open_top;
@@ -756,7 +756,7 @@ open_top:
 	    !(flag & O_NONBLOCK)) {
 		++pp->sp_wopeners;
 		DPRINT((pp, DBG_OPEN, "sleeping for carrier\n"));
-		error = tsleep(TSA_CARR_ON(tp), TTIPRI|PCATCH, "sidcd", 0);
+		error = tsleep(TSA_CARR_ON(tp), PCATCH, "sidcd", 0);
 		--pp->sp_wopeners;
 		if (error != 0)
 			goto out;
@@ -917,7 +917,7 @@ siwrite(dev_t dev, struct uio *uio, int flag)
 	while (pp->sp_state & SS_BLOCKWRITE) {
 		pp->sp_state |= SS_WAITWRITE;
 		DPRINT((pp, DBG_WRITE, "in siwrite, wait for SS_BLOCKWRITE to clear\n"));
-		if ((error = ttysleep(tp, (caddr_t)pp, TTOPRI|PCATCH,
+		if ((error = ttysleep(tp, (caddr_t)pp, PCATCH,
 				     "siwrite", tp->t_timeout))) {
 			if (error == EWOULDBLOCK)
 				error = EIO;
@@ -2072,7 +2072,7 @@ si_command(struct si_port *pp, int cmd, int waitflag)
 				x, cmd));
 			splx(oldspl);
 			return;
-		} else if (ttysleep(pp->sp_tty, (caddr_t)&pp->sp_state, TTIPRI|PCATCH,
+		} else if (ttysleep(pp->sp_tty, (caddr_t)&pp->sp_state, PCATCH,
 				"sicmd1", 1)) {
 			splx(oldspl);
 			return;
@@ -2106,7 +2106,7 @@ si_command(struct si_port *pp, int cmd, int waitflag)
 			return;
 		} else while(ccbp->hi_stat != IDLE_OPEN &&
 			     ccbp->hi_stat != IDLE_BREAK) {
-			if (ttysleep(pp->sp_tty, (caddr_t)&pp->sp_state, TTIPRI|PCATCH,
+			if (ttysleep(pp->sp_tty, (caddr_t)&pp->sp_state, PCATCH,
 			    "sicmd2", 0))
 				break;
 		}
diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c
index 0652f6b84f..960791b5c2 100644
--- a/sys/dev/serial/sio/sio.c
+++ b/sys/dev/serial/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/isa/sio.c,v 1.291.2.35 2003/05/18 08:51:15 murray Exp $
- * $DragonFly: src/sys/dev/serial/sio/sio.c,v 1.6 2003/07/06 21:23:50 dillon Exp $
+ * $DragonFly: src/sys/dev/serial/sio/sio.c,v 1.7 2003/07/19 21:14:37 dillon Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -1478,7 +1478,7 @@ sioopen(dev_t dev, int flag, int mode, struct thread *td)
 	 */
 open_top:
 	while (com->state & CS_DTR_OFF) {
-		error = tsleep(&com->dtr_wait, TTIPRI | PCATCH, "siodtr", 0);
+		error = tsleep(&com->dtr_wait, PCATCH, "siodtr", 0);
 		if (com_addr(unit) == NULL)
 			return (ENXIO);
 		if (error != 0 || com->gone)
@@ -1501,7 +1501,7 @@ open_top:
 					goto out;
 				}
 				error =	tsleep(&com->active_out,
-					       TTIPRI | PCATCH, "siobi", 0);
+					       PCATCH, "siobi", 0);
 				if (com_addr(unit) == NULL)
 					return (ENXIO);
 				if (error != 0 || com->gone)
@@ -1608,7 +1608,7 @@ open_top:
 	if (!(tp->t_state & TS_CARR_ON) && !(mynor & CALLOUT_MASK)
 	    && !(tp->t_cflag & CLOCAL) && !(flag & O_NONBLOCK)) {
 		++com->wopeners;
-		error = tsleep(TSA_CARR_ON(tp), TTIPRI | PCATCH, "siodcd", 0);
+		error = tsleep(TSA_CARR_ON(tp), PCATCH, "siodcd", 0);
 		if (com_addr(unit) == NULL)
 			return (ENXIO);
 		--com->wopeners;
diff --git a/sys/dev/serial/stl/stallion.c b/sys/dev/serial/stl/stallion.c
index 77113a4e1f..6d375d39c5 100644
--- a/sys/dev/serial/stl/stallion.c
+++ b/sys/dev/serial/stl/stallion.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/stallion.c,v 1.39.2.2 2001/08/30 12:29:57 murray Exp $
- * $DragonFly: src/sys/dev/serial/stl/stallion.c,v 1.3 2003/06/25 03:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/serial/stl/stallion.c,v 1.4 2003/07/19 21:14:34 dillon Exp $
  */
 
 /*****************************************************************************/
@@ -1190,8 +1190,7 @@ stlopen_restart:
  *	Wait here for the DTR drop timeout period to expire.
  */
 	while (portp->state & ASY_DTRWAIT) {
-		error = tsleep(&portp->dtrwait, (TTIPRI | PCATCH),
-			"stldtr", 0);
+		error = tsleep(&portp->dtrwait, PCATCH, "stldtr", 0);
 		if (error)
 			goto stlopen_end;
 	}
@@ -1225,7 +1224,7 @@ stlopen_restart:
 					goto stlopen_end;
 				}
 				error = tsleep(&portp->callout,
-					(TTIPRI | PCATCH), "stlcall", 0);
+					    PCATCH, "stlcall", 0);
 				if (error)
 					goto stlopen_end;
 				goto stlopen_restart;
@@ -1245,7 +1244,7 @@ stlopen_restart:
 			((tp->t_cflag & CLOCAL) == 0) &&
 			((flag & O_NONBLOCK) == 0)) {
 		portp->waitopens++;
-		error = tsleep(TSA_CARR_ON(tp), (TTIPRI | PCATCH), "stldcd", 0);
+		error = tsleep(TSA_CARR_ON(tp), PCATCH, "stldcd", 0);
 		portp->waitopens--;
 		if (error)
 			goto stlopen_end;
diff --git a/sys/dev/serial/stli/istallion.c b/sys/dev/serial/stli/istallion.c
index 6886123ea7..1c10230e0f 100644
--- a/sys/dev/serial/stli/istallion.c
+++ b/sys/dev/serial/stli/istallion.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/istallion.c,v 1.36.2.2 2001/08/30 12:29:57 murray Exp $
- * $DragonFly: src/sys/dev/serial/stli/istallion.c,v 1.3 2003/06/25 03:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/serial/stli/istallion.c,v 1.4 2003/07/19 21:14:34 dillon Exp $
  */
 
 /*****************************************************************************/
@@ -960,8 +960,7 @@ stliopen_restart:
  *	Wait here for the DTR drop timeout period to expire.
  */
 	while (portp->state & ST_DTRWAIT) {
-		error = tsleep(&portp->dtrwait, (TTIPRI | PCATCH),
-			"stlidtr", 0);
+		error = tsleep(&portp->dtrwait, PCATCH, "stlidtr", 0);
 		if (error)
 			goto stliopen_end;
 	}
@@ -971,8 +970,7 @@ stliopen_restart:
  *	hold up here 'till it is done.
  */
 	while (portp->state & (ST_INITIALIZING | ST_CLOSING)) {
-		error = tsleep(&portp->state, (TTIPRI | PCATCH),
-			"stliraw", 0);
+		error = tsleep(&portp->state, PCATCH, "stliraw", 0);
 		if (error)
 			goto stliopen_end;
 	}
@@ -1007,7 +1005,7 @@ stliopen_restart:
 					goto stliopen_end;
 				}
 				error = tsleep(&portp->callout,
-					(TTIPRI | PCATCH), "stlicall", 0);
+					    PCATCH, "stlicall", 0);
 				if (error)
 					goto stliopen_end;
 				goto stliopen_restart;
@@ -1028,7 +1026,7 @@ stliopen_restart:
 			((tp->t_cflag & CLOCAL) == 0) &&
 			((flag & O_NONBLOCK) == 0)) {
 		portp->waitopens++;
-		error = tsleep(TSA_CARR_ON(tp), (TTIPRI | PCATCH), "stlidcd",0);
+		error = tsleep(TSA_CARR_ON(tp), PCATCH, "stlidcd",0);
 		portp->waitopens--;
 		if (error)
 			goto stliopen_end;
@@ -1531,7 +1529,7 @@ static int stli_rawopen(stlibrd_t *brdp, stliport_t *portp, unsigned long arg, i
  *	memory, so we must wait until it is complete.
  */
 	while (portp->state & ST_CLOSING) {
-		rc = tsleep(&portp->state, (TTIPRI | PCATCH), "stliraw", 0);
+		rc = tsleep(&portp->state, PCATCH, "stliraw", 0);
 		if (rc) {
 			splx(x);
 			return(rc);
@@ -1565,7 +1563,7 @@ static int stli_rawopen(stlibrd_t *brdp, stliport_t *portp, unsigned long arg, i
 	rc = 0;
 	portp->state |= ST_OPENING;
 	while (portp->state & ST_OPENING) {
-		rc = tsleep(&portp->state, (TTIPRI | PCATCH), "stliraw", 0);
+		rc = tsleep(&portp->state, PCATCH, "stliraw", 0);
 		if (rc) {
 			splx(x);
 			return(rc);
@@ -1606,8 +1604,7 @@ static int stli_rawclose(stlibrd_t *brdp, stliport_t *portp, unsigned long arg,
  */
 	if (wait) {
 		while (portp->state & ST_CLOSING) {
-			rc = tsleep(&portp->state, (TTIPRI | PCATCH),
-				"stliraw", 0);
+			rc = tsleep(&portp->state, PCATCH, "stliraw", 0);
 			if (rc) {
 				splx(x);
 				return(rc);
@@ -1640,7 +1637,7 @@ static int stli_rawclose(stlibrd_t *brdp, stliport_t *portp, unsigned long arg,
  */
 	rc = 0;
 	while (portp->state & ST_CLOSING) {
-		rc = tsleep(&portp->state, (TTIPRI | PCATCH), "stliraw", 0);
+		rc = tsleep(&portp->state, PCATCH, "stliraw", 0);
 		if (rc) {
 			splx(x);
 			return(rc);
@@ -1674,7 +1671,7 @@ static int stli_cmdwait(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, v
 
 	x = spltty();
 	while (portp->state & ST_CMDING) {
-		rc = tsleep(&portp->state, (TTIPRI | PCATCH), "stliraw", 0);
+		rc = tsleep(&portp->state, PCATCH, "stliraw", 0);
 		if (rc) {
 			splx(x);
 			return(rc);
@@ -1684,7 +1681,7 @@ static int stli_cmdwait(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, v
 	stli_sendcmd(brdp, portp, cmd, arg, size, copyback);
 
 	while (portp->state & ST_CMDING) {
-		rc = tsleep(&portp->state, (TTIPRI | PCATCH), "stliraw", 0);
+		rc = tsleep(&portp->state, PCATCH, "stliraw", 0);
 		if (rc) {
 			splx(x);
 			return(rc);
diff --git a/sys/dev/sound/isa/i386/pca/pcaudio.c b/sys/dev/sound/isa/i386/pca/pcaudio.c
index 42b925c919..f6231d32fa 100644
--- a/sys/dev/sound/isa/i386/pca/pcaudio.c
+++ b/sys/dev/sound/isa/i386/pca/pcaudio.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/pcaudio.c,v 1.58 2000/01/25 21:58:43 dfr Exp $
- * $DragonFly: src/sys/dev/sound/isa/i386/pca/Attic/pcaudio.c,v 1.2 2003/06/17 04:28:37 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/isa/i386/pca/Attic/pcaudio.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -309,7 +309,7 @@ pca_wait(void)
 	    pca_status.in_use[2]) {
 		x = spltty();
 		pca_sleep = 1;
-		error = tsleep(&pca_sleep, PZERO|PCATCH, "pca_drain", 0);
+		error = tsleep(&pca_sleep, PCATCH, "pca_drain", 0);
 		pca_sleep = 0;
 		splx(x);
 		if (error != 0 && error != ERESTART) {
@@ -425,7 +425,7 @@ pcawrite(dev_t dev, struct uio *uio, int flag)
 				return EWOULDBLOCK;
 			x = spltty();
 			pca_sleep = 1;
-			error = tsleep(&pca_sleep, PZERO|PCATCH, "pca_wait", 0);
+			error = tsleep(&pca_sleep, PCATCH, "pca_wait", 0);
 			pca_sleep = 0;
 			splx(x);
 			if (error != 0 && error != ERESTART) {
diff --git a/sys/dev/sound/isa/i386/spkr/spkr.c b/sys/dev/sound/isa/i386/spkr/spkr.c
index 0d602bec61..01c22067b2 100644
--- a/sys/dev/sound/isa/i386/spkr/spkr.c
+++ b/sys/dev/sound/isa/i386/spkr/spkr.c
@@ -5,7 +5,7 @@
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
  * $FreeBSD: src/sys/i386/isa/spkr.c,v 1.45 2000/01/29 16:00:32 peter Exp $
- * $DragonFly: src/sys/dev/sound/isa/i386/spkr/Attic/spkr.c,v 1.4 2003/07/06 21:23:49 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/isa/i386/spkr/Attic/spkr.c,v 1.5 2003/07/19 21:14:34 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -62,7 +62,6 @@ static struct cdevsw spkr_cdevsw = {
  */
 #define PPI_SPKR	0x03	/* turn these PPI bits on to pass sound */
 
-#define SPKRPRI PSOCK
 static char endtone, endrest;
 
 static void tone __P((unsigned int thz, unsigned int ticks));
@@ -112,7 +111,7 @@ tone(thz, ticks)
      * emitted.
      */
     if (ticks > 0)
-	tsleep((caddr_t)&endtone, SPKRPRI | PCATCH, "spkrtn", ticks);
+	tsleep((caddr_t)&endtone, PCATCH, "spkrtn", ticks);
     outb(IO_PPI, inb(IO_PPI) & ~PPI_SPKR);
     sps = splclock();
     release_timer2();
@@ -133,7 +132,7 @@ rest(ticks)
     (void) printf("rest: %d\n", ticks);
 #endif /* DEBUG */
     if (ticks > 0)
-	tsleep((caddr_t)&endrest, SPKRPRI | PCATCH, "spkrrs", ticks);
+	tsleep((caddr_t)&endrest, PCATCH, "spkrrs", ticks);
 }
 
 /**************** PLAY STRING INTERPRETER BEGINS HERE **********************
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index 3fa0791ea7..a492b81b7c 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -25,14 +25,14 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.19.2.19 2003/03/11 15:15:41 orion Exp $
- * $DragonFly: src/sys/dev/sound/pcm/channel.c,v 1.3 2003/06/23 17:55:34 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pcm/channel.c,v 1.4 2003/07/19 21:14:29 dillon Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/channel.c,v 1.3 2003/06/23 17:55:34 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/channel.c,v 1.4 2003/07/19 21:14:29 dillon Exp $");
 
 #define MIN_CHUNK_SIZE 		256	/* for uiomove etc. */
 #define	DMA_ALIGN_THRESHOLD	4
@@ -134,7 +134,7 @@ chn_sleep(struct pcm_channel *c, char *str, int timeout)
 #ifdef USING_MUTEX
 	ret = msleep(bs, c->lock, PRIBIO | PCATCH, str, timeout);
 #else
-	ret = tsleep(bs, PRIBIO | PCATCH, str, timeout);
+	ret = tsleep(bs, PCATCH, str, timeout);
 #endif
 
 	return ret;
diff --git a/sys/dev/usbmisc/ucom/ucom.c b/sys/dev/usbmisc/ucom/ucom.c
index d3f689547f..581bd95401 100644
--- a/sys/dev/usbmisc/ucom/ucom.c
+++ b/sys/dev/usbmisc/ucom/ucom.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ucom.c,v 1.24.2.2 2003/01/17 17:32:10 joe Exp $	*/
-/*	$DragonFly: src/sys/dev/usbmisc/ucom/ucom.c,v 1.4 2003/06/25 03:55:50 dillon Exp $	*/
+/*	$DragonFly: src/sys/dev/usbmisc/ucom/ucom.c,v 1.5 2003/07/19 21:14:30 dillon Exp $	*/
 
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
@@ -254,7 +254,7 @@ ucom_shutdown(struct ucom_softc *sc)
 	 */
 	if (ISSET(tp->t_cflag, HUPCL)) {
 		(void)ucomctl(sc, TIOCM_DTR, DMBIC);
-		(void)tsleep(sc, TTIPRI, "ucomsd", hz);
+		(void)tsleep(sc, 0, "ucomsd", hz);
 	}
 }
 
@@ -291,7 +291,7 @@ ucomopen(dev_t dev, int flag, int mode, usb_proc_ptr td)
 	 */
 	s = spltty();
 	while (sc->sc_opening)
-		tsleep(&sc->sc_opening, PRIBIO, "ucomop", 0);
+		tsleep(&sc->sc_opening, 0, "ucomop", 0);
 	sc->sc_opening = 1;
 
 	if (!ISSET(tp->t_state, TS_ISOPEN)) {
diff --git a/sys/dev/usbmisc/ugen/ugen.c b/sys/dev/usbmisc/ugen/ugen.c
index a7c9f0b7bc..6b1169c316 100644
--- a/sys/dev/usbmisc/ugen/ugen.c
+++ b/sys/dev/usbmisc/ugen/ugen.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: ugen.c,v 1.27 1999/10/28 12:08:38 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.38.2.9 2002/11/06 14:41:01 joe Exp $	*/
-/*	$DragonFly: src/sys/dev/usbmisc/ugen/ugen.c,v 1.4 2003/06/25 03:55:50 dillon Exp $	*/
+/*	$DragonFly: src/sys/dev/usbmisc/ugen/ugen.c,v 1.5 2003/07/19 21:14:30 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -548,7 +548,7 @@ ugen_do_read(struct ugen_softc *sc, int endpt, struct uio *uio, int flag)
 			}
 			sce->state |= UGEN_ASLP;
 			DPRINTFN(5, ("ugenread: sleep on %p\n", sc));
-			error = tsleep(sce, PZERO | PCATCH, "ugenri", 0);
+			error = tsleep(sce, PCATCH, "ugenri", 0);
 			DPRINTFN(5, ("ugenread: woke, error=%d\n", error));
 			if (sc->sc_dying)
 				error = EIO;
@@ -612,7 +612,7 @@ ugen_do_read(struct ugen_softc *sc, int endpt, struct uio *uio, int flag)
 			}
 			sce->state |= UGEN_ASLP;
 			DPRINTFN(5, ("ugenread: sleep on %p\n", sc));
-			error = tsleep(sce, PZERO | PCATCH, "ugenri", 0);
+			error = tsleep(sce, PCATCH, "ugenri", 0);
 			DPRINTFN(5, ("ugenread: woke, error=%d\n", error));
 			if (sc->sc_dying)
 				error = EIO;
diff --git a/sys/dev/usbmisc/uhid/uhid.c b/sys/dev/usbmisc/uhid/uhid.c
index b35014ae34..f4520b0238 100644
--- a/sys/dev/usbmisc/uhid/uhid.c
+++ b/sys/dev/usbmisc/uhid/uhid.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: uhid.c,v 1.38 2000/04/27 15:26:48 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhid.c,v 1.27.2.12 2002/11/06 20:23:50 joe Exp $	*/
-/*	$DragonFly: src/sys/dev/usbmisc/uhid/uhid.c,v 1.3 2003/06/23 17:55:36 dillon Exp $	*/
+/*	$DragonFly: src/sys/dev/usbmisc/uhid/uhid.c,v 1.4 2003/07/19 21:14:30 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -480,7 +480,7 @@ uhid_do_read(struct uhid_softc *sc, struct uio *uio, int flag)
 		}
 		sc->sc_state |= UHID_ASLP;
 		DPRINTFN(5, ("uhidread: sleep on %p\n", sc));
-		error = tsleep(&sc->sc_q, PZERO | PCATCH, "uhidrea", 0);
+		error = tsleep(&sc->sc_q, PCATCH, "uhidrea", 0);
 		DPRINTFN(5, ("uhidread: woke, error=%d\n", error));
 		if (sc->sc_dying)
 			error = EIO;
diff --git a/sys/dev/usbmisc/ulpt/ulpt.c b/sys/dev/usbmisc/ulpt/ulpt.c
index dfaf7c6e1e..543eea9880 100644
--- a/sys/dev/usbmisc/ulpt/ulpt.c
+++ b/sys/dev/usbmisc/ulpt/ulpt.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: ulpt.c,v 1.29 1999/11/17 23:00:50 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.26.2.13 2002/11/06 20:23:50 joe Exp $	*/
-/*	$DragonFly: src/sys/dev/usbmisc/ulpt/ulpt.c,v 1.2 2003/06/17 04:28:32 dillon Exp $	*/
+/*	$DragonFly: src/sys/dev/usbmisc/ulpt/ulpt.c,v 1.3 2003/07/19 21:14:30 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -69,7 +69,6 @@
 #define	TIMEOUT		hz*16	/* wait up to 16 seconds for a ready */
 #define	STEP		hz/4
 
-#define	LPTPRI		(PZERO+8)
 #define	ULPT_BSIZE	16384
 
 #ifdef USB_DEBUG
@@ -419,7 +418,7 @@ ulptopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 		}
 
 		/* wait 1/4 second, give up if we get a signal */
-		error = tsleep((caddr_t)sc, LPTPRI | PCATCH, "ulptop", STEP);
+		error = tsleep((caddr_t)sc, PCATCH, "ulptop", STEP);
 		if (error != EWOULDBLOCK) {
 			sc->sc_state = 0;
 			return (error);
diff --git a/sys/dev/usbmisc/umodem/umodem.c b/sys/dev/usbmisc/umodem/umodem.c
index 76883b8c30..d440ebb008 100644
--- a/sys/dev/usbmisc/umodem/umodem.c
+++ b/sys/dev/usbmisc/umodem/umodem.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: umodem.c,v 1.5 1999/01/08 11:58:25 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/umodem.c,v 1.17.2.9 2002/11/06 20:23:50 joe Exp $	*/
-/*	$DragonFly: src/sys/dev/usbmisc/umodem/umodem.c,v 1.3 2003/06/23 17:55:36 dillon Exp $	*/
+/*	$DragonFly: src/sys/dev/usbmisc/umodem/umodem.c,v 1.4 2003/07/19 21:14:30 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -601,7 +601,7 @@ umodemopen(dev_t dev, int flag, int mode, usb_proc_ptr td)
 	 */
 	s = spltty();
 	while (sc->sc_opening)
-		tsleep(&sc->sc_opening, PRIBIO, "umdmop", 0);
+		tsleep(&sc->sc_opening, 0, "umdmop", 0);
 	sc->sc_opening = 1;
 	
 #if defined(__NetBSD__) || defined(__OpenBSD__)
@@ -993,9 +993,9 @@ umodem_shutdown(struct umodem_softc *sc)
 	if (ISSET(tp->t_cflag, HUPCL)) {
 		umodem_modem(sc, 0);
 #if defined(__NetBSD__) || defined(__OpenBSD__)
-		(void) tsleep(sc, TTIPRI, ttclos, hz);
+		(void) tsleep(sc, 0, ttclos, hz);
 #elif defined(__FreeBSD__)
-		(void) tsleep(sc, TTIPRI, "umdmsd", hz);
+		(void) tsleep(sc, 0, "umdmsd", hz);
 #endif
 	}
 }
diff --git a/sys/dev/usbmisc/ums/ums.c b/sys/dev/usbmisc/ums/ums.c
index 4a707ffbb7..2c398900b8 100644
--- a/sys/dev/usbmisc/ums/ums.c
+++ b/sys/dev/usbmisc/ums/ums.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/dev/usb/ums.c,v 1.36.2.6 2002/11/06 20:23:50 joe Exp $	*/
-/*	$DragonFly: src/sys/dev/usbmisc/ums/ums.c,v 1.2 2003/06/17 04:28:32 dillon Exp $	*/
+/*	$DragonFly: src/sys/dev/usbmisc/ums/ums.c,v 1.3 2003/07/19 21:14:30 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -637,7 +637,7 @@ ums_read(dev_t dev, struct uio *uio, int flag)
 		}
 		
 		sc->state |= UMS_ASLEEP;	/* blocking I/O */
-		error = tsleep(sc, PZERO | PCATCH, "umsrea", 0);
+		error = tsleep(sc, PCATCH, "umsrea", 0);
 		if (error) {
 			splx(s);
 			return error;
diff --git a/sys/dev/usbmisc/uvscom/uvscom.c b/sys/dev/usbmisc/uvscom/uvscom.c
index 329a8aaaea..4ce80100d0 100644
--- a/sys/dev/usbmisc/uvscom/uvscom.c
+++ b/sys/dev/usbmisc/uvscom/uvscom.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/uvscom.c,v 1.9.2.3 2003/02/13 13:03:25 sanpei Exp $
- * $DragonFly: src/sys/dev/usbmisc/uvscom/uvscom.c,v 1.2 2003/06/17 04:28:32 dillon Exp $
+ * $DragonFly: src/sys/dev/usbmisc/uvscom/uvscom.c,v 1.3 2003/07/19 21:14:30 dillon Exp $
  */
 
 /*
@@ -753,7 +753,7 @@ uvscom_open(void *addr, int portno)
 		/* unit is not ready */
 
 		for (i = UVSCOM_UNIT_WAIT; i > 0; --i) {
-			tsleep(&err, TTIPRI, "uvsop", hz);	/* XXX */
+			tsleep(&err, 0, "uvsop", hz);	/* XXX */
 			if (ISSET(sc->sc_usr, UVSCOM_USTAT_MASK))
 				break;
 		}
diff --git a/sys/dev/video/bktr/bktr_audio.c b/sys/dev/video/bktr/bktr_audio.c
index 5847954ea7..0b456d99b6 100644
--- a/sys/dev/video/bktr/bktr_audio.c
+++ b/sys/dev/video/bktr/bktr_audio.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.2.2.5 2003/02/08 02:04:57 orion Exp $ */
-/* $DragonFly: src/sys/dev/video/bktr/bktr_audio.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ */
+/* $DragonFly: src/sys/dev/video/bktr/bktr_audio.c,v 1.3 2003/07/19 21:14:19 dillon Exp $ */
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
  * and TV Tuner cards using the Brooktree Bt848, Bt848A, Bt849A, Bt878, Bt879
@@ -267,7 +267,7 @@ temp_mute( bktr_ptr_t bktr, int flag )
 		set_audio( bktr, AUDIO_MUTE );		/* prevent 'click' */
 	}
 	else {
-		tsleep( BKTR_SLEEP, PZERO, "tuning", hz/8 );
+		tsleep( BKTR_SLEEP, 0, "tuning", hz/8 );
 		if ( muteState == FALSE )
 			set_audio( bktr, AUDIO_UNMUTE );
 	}
diff --git a/sys/dev/video/bktr/bktr_core.c b/sys/dev/video/bktr/bktr_core.c
index 13e31aae3d..8a6b7eb255 100644
--- a/sys/dev/video/bktr/bktr_core.c
+++ b/sys/dev/video/bktr/bktr_core.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.103.2.4 2000/11/01 09:36:14 roger Exp $ */
-/* $DragonFly: src/sys/dev/video/bktr/bktr_core.c,v 1.3 2003/06/23 17:55:30 dillon Exp $ */
+/* $DragonFly: src/sys/dev/video/bktr/bktr_core.c,v 1.4 2003/07/19 21:14:19 dillon Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -224,10 +224,6 @@ bktr_name(bktr_ptr_t bktr)
 
 typedef u_char bool_t;
 
-#define BKTRPRI (PZERO+8)|PCATCH
-#define VBIPRI  (PZERO-4)|PCATCH
-
-
 /*
  * memory allocated for DMA programs
  */
@@ -1189,7 +1185,7 @@ video_read(bktr_ptr_t bktr, int unit, dev_t dev, struct uio *uio)
                             BT848_INT_FMTCHG);
 
 
-	status = tsleep(BKTR_SLEEP, BKTRPRI, "captur", 0);
+	status = tsleep(BKTR_SLEEP, PCATCH, "captur", 0);
 	if (!status)		/* successful capture */
 		status = uiomove((caddr_t)bktr->bigbuf, count, uio);
 	else
@@ -1221,7 +1217,7 @@ vbi_read(bktr_ptr_t bktr, struct uio *uio, int ioflag)
 		}
 
 		bktr->vbi_read_blocked = TRUE;
-		if ((status = tsleep(VBI_SLEEP, VBIPRI, "vbi", 0))) {
+		if ((status = tsleep(VBI_SLEEP, PCATCH, "vbi", 0))) {
 			return status;
 		}
 	}
@@ -1587,7 +1583,7 @@ video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct thr
 					    BT848_INT_FMTCHG);
 
 			OUTB(bktr, BKTR_CAP_CTL, bktr->bktr_cap_ctl);
-			error = tsleep(BKTR_SLEEP, BKTRPRI, "captur", hz);
+			error = tsleep(BKTR_SLEEP, PCATCH, "captur", hz);
 			if (error && (error != ERESTART)) {
 				/*  Here if we didn't get complete frame  */
 #ifdef DIAGNOSTIC
diff --git a/sys/dev/video/bktr/bktr_tuner.c b/sys/dev/video/bktr/bktr_tuner.c
index db8e0c96e9..e09847d430 100644
--- a/sys/dev/video/bktr/bktr_tuner.c
+++ b/sys/dev/video/bktr/bktr_tuner.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.5.2.3 2000/10/26 16:38:46 roger Exp $ */
-/* $DragonFly: src/sys/dev/video/bktr/bktr_tuner.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ */
+/* $DragonFly: src/sys/dev/video/bktr/bktr_tuner.c,v 1.3 2003/07/19 21:14:19 dillon Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -915,7 +915,7 @@ do_afc( bktr_ptr_t bktr, int addr, int frequency )
 	origFrequency = frequency;
 
 	/* wait for first setting to take effect */
-	tsleep( BKTR_SLEEP, PZERO, "tuning", hz/8 );
+	tsleep( BKTR_SLEEP, 0, "tuning", hz/8 );
 
 	if ( (status = i2cRead( bktr, addr + 1 )) < 0 )
 		return( -1 );
diff --git a/sys/dev/video/gsc/gsc.c b/sys/dev/video/gsc/gsc.c
index 04b6f9df11..26a46eabee 100644
--- a/sys/dev/video/gsc/gsc.c
+++ b/sys/dev/video/gsc/gsc.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/gsc.c,v 1.35.2.1 2000/08/08 19:49:53 peter Exp $
- * $DragonFly: src/sys/dev/video/gsc/gsc.c,v 1.2 2003/06/17 04:28:37 dillon Exp $
+ * $DragonFly: src/sys/dev/video/gsc/gsc.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  *
  */
 
@@ -81,7 +81,6 @@
 
 #define TIMEOUT (hz*15)  /* timeout while reading a buffer - default value */
 #define LONG    (hz/60)  /* timesteps while reading a buffer */
-#define GSCPRI  PRIBIO   /* priority while reading a buffer */
 
 /***********************************************************************
  *
@@ -341,7 +340,7 @@ buffer_read(struct gsc_unit *scu)
 	  res = EWOULDBLOCK;
 	  break;
 	}
-      res = tsleep((caddr_t)scu, GSCPRI | PCATCH, "gscread", LONG);
+      res = tsleep((caddr_t)scu, PCATCH, "gscread", LONG);
       if ( ( res == 0 ) || ( res == EWOULDBLOCK ) )
 	res = SUCCESS;
       else
diff --git a/sys/dev/video/meteor/meteor.c b/sys/dev/video/meteor/meteor.c
index 16efb795e5..1e6ad8ec44 100644
--- a/sys/dev/video/meteor/meteor.c
+++ b/sys/dev/video/meteor/meteor.c
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/meteor.c,v 1.49 1999/09/25 18:24:41 phk Exp $
- * $DragonFly: src/sys/dev/video/meteor/meteor.c,v 1.2 2003/06/17 04:28:57 dillon Exp $
+ * $DragonFly: src/sys/dev/video/meteor/meteor.c,v 1.3 2003/07/19 21:14:49 dillon Exp $
  */
 
 /*		Change History:
@@ -190,7 +190,7 @@ static void meteor_intr __P((void *arg));
 static meteor_reg_t meteor[NMETEOR];
 #define METEOR_NUM(mtr)	((mtr - &meteor[0])/sizeof(meteor_reg_t))
 
-#define METPRI (PZERO+8)|PCATCH
+#define METPRI	PCATCH
 
 static	const char*	met_probe (pcici_t tag, pcidi_t type);
 static	void	met_attach(pcici_t tag, int unit);
diff --git a/sys/dev/video/pcvt/i386/pcvt_ext.c b/sys/dev/video/pcvt/i386/pcvt_ext.c
index b64fb06d12..91aa5fd127 100644
--- a/sys/dev/video/pcvt/i386/pcvt_ext.c
+++ b/sys/dev/video/pcvt/i386/pcvt_ext.c
@@ -45,7 +45,7 @@
  * 	Last Edit-Date: [Mon Dec 27 14:05:16 1999]
  *
  * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_ext.c,v 1.17 1999/12/30 16:17:09 hm Exp $
- * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_ext.c,v 1.3 2003/06/25 03:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_ext.c,v 1.4 2003/07/19 21:14:35 dillon Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -2648,7 +2648,7 @@ usl_vt_ioctl(Dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
 			{
 				vs[i].vt_status |= VT_WAIT_ACT;
 				error = tsleep((caddr_t)&vs[i].smode,
-					       PZERO | PCATCH, "waitvt", 0);
+					       PCATCH, "waitvt", 0);
 			}
 			splx(x);
 		}
diff --git a/sys/dev/video/pcvt/i386/pcvt_vtf.c b/sys/dev/video/pcvt/i386/pcvt_vtf.c
index 1028734520..3211716d0d 100644
--- a/sys/dev/video/pcvt/i386/pcvt_vtf.c
+++ b/sys/dev/video/pcvt/i386/pcvt_vtf.c
@@ -45,7 +45,7 @@
  *	Last Edit-Date: [Mon Dec 27 14:13:33 1999]
  *
  * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_vtf.c,v 1.11 1999/12/30 16:17:11 hm Exp $
- * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_vtf.c,v 1.2 2003/06/17 04:28:38 dillon Exp $
+ * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_vtf.c,v 1.3 2003/07/19 21:14:35 dillon Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -1987,7 +1987,7 @@ roll_up(struct video_state *svsp, int n)
 		n * svsp->maxcol);
 
 /*XXX*/	if(svsp->scroll_lock && svsp->openf && curproc)
-		tsleep((caddr_t)&(svsp->scroll_lock), PPAUSE, "scrlck", 0);
+		tsleep((caddr_t)&(svsp->scroll_lock), 0, "scrlck", 0);
 }
 
 /*---------------------------------------------------------------------------*
@@ -2053,7 +2053,7 @@ roll_down(struct video_state *svsp, int n)
 		n * svsp->maxcol);
 
 /*XXX*/	if(svsp->scroll_lock && svsp->openf && curproc)
-		tsleep((caddr_t)&(svsp->scroll_lock), PPAUSE, "scrlck", 0);
+		tsleep((caddr_t)&(svsp->scroll_lock), 0, "scrlck", 0);
 }
 
 /*---------------------------------------------------------------------------*
diff --git a/sys/emulation/ibcs2/i386/ibcs2_xenix.c b/sys/emulation/ibcs2/i386/ibcs2_xenix.c
index bf09e25f3e..3b60828149 100644
--- a/sys/emulation/ibcs2/i386/ibcs2_xenix.c
+++ b/sys/emulation/ibcs2/i386/ibcs2_xenix.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.c,v 1.20 1999/12/15 23:01:46 eivind Exp $
- * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_xenix.c,v 1.4 2003/06/25 03:55:53 dillon Exp $
+ * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_xenix.c,v 1.5 2003/07/19 21:14:34 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -132,9 +132,10 @@ xenix_nap(struct xenix_nap_args *uap)
 
 	DPRINTF(("IBCS2: 'xenix nap %d ms'\n", SCARG(uap, millisec)));
 	period = (long)SCARG(uap, millisec) / (1000/hz);
-	if (period)
-		while (tsleep(&period, PPAUSE, "nap", period) 
-		       != EWOULDBLOCK) ;
+	if (period) {
+		while (tsleep(&period, 0, "nap", period) != EWOULDBLOCK)
+		    ;
+	}
 	return 0;
 }
 
diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c b/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c
index e0a2a9a1a7..2675afaf26 100644
--- a/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c
+++ b/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c
@@ -39,7 +39,7 @@
  *	@(#)procfs_subr.c	8.6 (Berkeley) 5/14/95
  *
  * $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs_subr.c,v 1.3.2.4 2001/06/25 19:46:47 pirzyk Exp $
- * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c,v 1.3 2003/06/25 03:55:55 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c,v 1.4 2003/07/19 21:14:36 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -112,7 +112,7 @@ loop:
 	 */
 	if (pfsvplock & PROCFS_LOCKED) {
 		pfsvplock |= PROCFS_WANT;
-		(void) tsleep((caddr_t) &pfsvplock, PINOD, "pfsavp", 0);
+		(void) tsleep((caddr_t) &pfsvplock, 0, "pfsavp", 0);
 		goto loop;
 	}
 	pfsvplock |= PROCFS_LOCKED;
@@ -253,7 +253,7 @@ linprocfs_rw(ap)
 		return (EACCES);
 
 	while (pfs->pfs_lockowner) {
-		tsleep(&pfs->pfs_lockowner, PRIBIO, "pfslck", 0);
+		tsleep(&pfs->pfs_lockowner, 0, "pfslck", 0);
 	}
 	pfs->pfs_lockowner = curthread;
 
diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c b/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c
index 58062dbc8a..e8c7f93b0d 100644
--- a/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c
+++ b/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c
@@ -39,7 +39,7 @@
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
  * $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs_vnops.c,v 1.3.2.5 2001/08/12 14:29:19 rwatson Exp $
- * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c,v 1.5 2003/06/26 05:55:13 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c,v 1.6 2003/07/19 21:14:36 dillon Exp $
  */
 
 /*
@@ -264,7 +264,7 @@ linprocfs_ioctl(ap)
 	case PIOCWAIT:
 	  psp = (struct procfs_status *)ap->a_data;
 	  if (procp->p_step == 0) {
-	    error = tsleep(&procp->p_stype, PWAIT | PCATCH, "piocwait", 0);
+	    error = tsleep(&procp->p_stype, PCATCH, "piocwait", 0);
 	    if (error)
 	      return error;
 	  }
diff --git a/sys/emulation/svr4/svr4_misc.c b/sys/emulation/svr4/svr4_misc.c
index 37562f7cb3..b626d34a0b 100644
--- a/sys/emulation/svr4/svr4_misc.c
+++ b/sys/emulation/svr4/svr4_misc.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  * $FreeBSD: src/sys/svr4/svr4_misc.c,v 1.13.2.7 2003/01/14 21:33:58 dillon Exp $
- * $DragonFly: src/sys/emulation/svr4/Attic/svr4_misc.c,v 1.5 2003/06/26 05:55:19 dillon Exp $
+ * $DragonFly: src/sys/emulation/svr4/Attic/svr4_misc.c,v 1.6 2003/07/19 21:14:49 dillon Exp $
  */
 
 /*
@@ -1309,7 +1309,7 @@ loop:
 		return 0;
 	}
 
-	if ((error = tsleep((caddr_t)p, PWAIT | PCATCH, "svr4_wait", 0)) != 0)
+	if ((error = tsleep((caddr_t)p, PCATCH, "svr4_wait", 0)) != 0)
 		return error;
 	goto loop;
 }
diff --git a/sys/i386/boot/dosboot/sysparam.h b/sys/i386/boot/dosboot/sysparam.h
index d65fadadb6..675da42d6f 100644
--- a/sys/i386/boot/dosboot/sysparam.h
+++ b/sys/i386/boot/dosboot/sysparam.h
@@ -37,7 +37,7 @@
  *
  *	@(#)param.h	8.2 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/i386/boot/dosboot/sysparam.h,v 1.5 1999/08/28 00:43:25 peter Exp $
- * $DragonFly: src/sys/i386/boot/dosboot/Attic/sysparam.h,v 1.3 2003/07/13 05:45:08 dillon Exp $
+ * $DragonFly: src/sys/i386/boot/dosboot/Attic/sysparam.h,v 1.4 2003/07/19 21:14:33 dillon Exp $
  */
 
 #ifndef _DOSBOOT_SYS_PARAM_H_
@@ -98,6 +98,7 @@ include <sys/rtprio.h>
  * Priorities.  Note that with 32 run queues, differences less than 4 are
  * insignificant.
  */
+#if 0
 #define	PSWP	0
 #define	PVM	4
 #define	PINOD	8
@@ -109,6 +110,7 @@ include <sys/rtprio.h>
 #define	PLOCK	36
 #define	PPAUSE	40
 #define	PUSER	50
+#endif
 #define	MAXPRI	127		/* Priorities range from 0 through MAXPRI. */
 
 #define	PRIMASK	0x0ff
diff --git a/sys/i386/gnu/isa/dgb.c b/sys/i386/gnu/isa/dgb.c
index 72f7fc569f..a47bf6a153 100644
--- a/sys/i386/gnu/isa/dgb.c
+++ b/sys/i386/gnu/isa/dgb.c
@@ -1,6 +1,6 @@
 /*-
  *  dgb.c $FreeBSD: src/sys/gnu/i386/isa/dgb.c,v 1.56.2.1 2001/02/26 04:23:09 jlemon Exp $
- *  dgb.c $DragonFly: src/sys/i386/gnu/isa/Attic/dgb.c,v 1.3 2003/06/25 03:55:52 dillon Exp $
+ *  dgb.c $DragonFly: src/sys/i386/gnu/isa/Attic/dgb.c,v 1.4 2003/07/19 21:14:32 dillon Exp $
  *
  *  Digiboard driver.
  *
@@ -972,7 +972,7 @@ open_top:
 	s=spltty();
 
 	while(port->closing) {
-		error=tsleep(&port->closing, TTOPRI|PCATCH, "dgocl", 0);
+		error=tsleep(&port->closing, PCATCH, "dgocl", 0);
 
 		if(error) {
 			DPRINT4(DB_OPEN,"dgb%d: port%d: tsleep(dgocl) error=%d\n",unit,pnum,error);
@@ -999,7 +999,7 @@ open_top:
 					goto out;
 				}
 				error =	tsleep(&port->active_out,
-					       TTIPRI | PCATCH, "dgbi", 0);
+					       PCATCH, "dgbi", 0);
 				if (error != 0) {
 					DPRINT4(DB_OPEN,"dgb%d: port%d: tsleep(dgbi) error=%d\n",
 						unit,pnum,error);
@@ -1063,7 +1063,7 @@ open_top:
 	if (!(tp->t_state & TS_CARR_ON) && !(mynor & CALLOUT_MASK)
 	    && !(tp->t_cflag & CLOCAL) && !(flag & O_NONBLOCK)) {
 		++port->wopeners;
-		error = tsleep(TSA_CARR_ON(tp), TTIPRI | PCATCH, "dgdcd", 0);
+		error = tsleep(TSA_CARR_ON(tp), PCATCH, "dgdcd", 0);
 		--port->wopeners;
 		if (error != 0) {
 			DPRINT4(DB_OPEN,"dgb%d: port%d: tsleep(dgdcd) error=%d\n",unit,pnum,error);
@@ -1180,7 +1180,7 @@ dgbhardclose(port)
 	splx(cs);
 
 	timeout(dgb_pause, &port->brdchan, hz/2);
-	tsleep(&port->brdchan, TTIPRI | PCATCH, "dgclo", 0);
+	tsleep(&port->brdchan, PCATCH, "dgclo", 0);
 }
 
 static void 
@@ -1784,7 +1784,7 @@ dgbdrain(port)
 		hidewin(sc);
 		port->draining=1;
 		timeout(wakeflush,port, hz);
-		error=tsleep(&port->draining, TTIPRI | PCATCH, "dgdrn", 0);
+		error=tsleep(&port->draining, PCATCH, "dgdrn", 0);
 		port->draining=0;
 		setwin(sc,0);
 
@@ -1842,7 +1842,7 @@ dgb_drain_or_flush(port)
 		hidewin(sc);
 		port->draining=1;
 		timeout(wakeflush,port, hz);
-		error=tsleep(&port->draining, TTIPRI | PCATCH, "dgfls", 0);
+		error=tsleep(&port->draining, PCATCH, "dgfls", 0);
 		port->draining=0;
 		setwin(sc,0);
 
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index de976b6d82..af290eab38 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -39,7 +39,7 @@
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $
- * $DragonFly: src/sys/i386/i386/Attic/mem.c,v 1.5 2003/07/04 05:57:25 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/mem.c,v 1.6 2003/07/19 21:14:33 dillon Exp $
  */
 
 /*
@@ -253,8 +253,7 @@ mmrw(dev, uio, flags)
 				 * Use tsleep() to get the error code right.
 				 * It should return immediately.
 				 */
-				error = tsleep(&rand_bolt,
-				    PZERO | PCATCH, "urand", 1);
+				error = tsleep(&rand_bolt, PCATCH, "urand", 1);
 				if (error != 0 && error != EWOULDBLOCK)
 					continue;
 			}
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 8ca8b15aeb..346b171887 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -35,7 +35,7 @@
  */
 /*
  * $FreeBSD: src/sys/i386/isa/asc.c,v 1.42.2.2 2001/03/01 03:22:39 jlemon Exp $
- * $DragonFly: src/sys/i386/isa/Attic/asc.c,v 1.2 2003/06/17 04:28:36 dillon Exp $
+ * $DragonFly: src/sys/i386/isa/Attic/asc.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  */
 
 #include "asc.h"
@@ -78,7 +78,6 @@
 #endif
 
 #define TIMEOUT (hz*15)  /* timeout while reading a buffer - default value */
-#define ASCPRI  PRIBIO   /* priority while reading a buffer */
 
 /***
  *** LAYOUT OF THE MINOR NUMBER
@@ -223,10 +222,10 @@ get_resolution(struct asc_unit *scu)
     res=0;
     scu->cmd_byte = ASC_STANDBY;
     outb(ASC_CMD, scu->cmd_byte);
-    tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascres", hz/10);
+    tsleep((caddr_t)scu, PCATCH, "ascres", hz/10);
     for(delay= 100; (res=inb(ASC_STAT)) & ASC_RDY_FLAG; delay--)
     {
-        i = tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascres0", 1);
+        i = tsleep((caddr_t)scu, PCATCH, "ascres0", 1);
         if ( ( i == 0 ) || ( i == EWOULDBLOCK ) )
 	    i = SUCCESS;
 	else
@@ -343,7 +342,7 @@ asc_reset(struct asc_unit *scu)
 
   outb(ASC_CFG,scu->cfg_byte);	/* for safety, do this here */
   outb(ASC_CMD,scu->cmd_byte);	/* probably not needed */
-  tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascres", hz/10); /* sleep .1 sec */
+  tsleep((caddr_t)scu, PCATCH, "ascres", hz/10); /* sleep .1 sec */
 
   scu->blen = DEFAULT_BLEN;
   scu->btime = TIMEOUT;
@@ -626,7 +625,7 @@ asc_startread(struct asc_unit *scu)
     /*** sub_28: light on etc...***/
   scu->cmd_byte = ASC_STANDBY;
   outb(ASC_CMD, scu->cmd_byte);
-  tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascstrd", hz/10); /* sleep .1 sec */
+  tsleep((caddr_t)scu, PCATCH, "ascstrd", hz/10); /* sleep .1 sec */
   return SUCCESS;
 }
 
@@ -656,7 +655,7 @@ ascclose(dev_t dev, int flags, int fmt, struct proc *p)
   outb(ASC_CFG, 0 ); /* don't save in CFG byte!!! */
   scu->cmd_byte &= ~ASC_LIGHT_ON;
   outb(ASC_CMD, scu->cmd_byte);/* light off */
-  tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascclo", hz/2); /* sleep 1/2 sec */
+  tsleep((caddr_t)scu, PCATCH, "ascclo", hz/2); /* sleep 1/2 sec */
   scu->cfg_byte &= ~ scu->dma_byte ; /* disable scanner dma */
   scu->cfg_byte &= ~ scu->int_byte ; /* disable scanner int */
   outb(ASC_CFG, scu->cfg_byte);
@@ -732,13 +731,13 @@ ascread(dev_t dev, struct uio *uio, int ioflag)
   if ( scu->sbuf.count == 0 ) { /* no data avail., must wait */
       if (!(scu->flags & DMA_ACTIVE)) dma_restart(scu);
       scu->flags |= SLEEPING;
-      res = tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascread", 0);
+      res = tsleep((caddr_t)scu, PCATCH, "ascread", 0);
       scu->flags &= ~SLEEPING;
       if ( res == 0 ) res = SUCCESS;
   }
   splx(sps); /* lower priority... */
   if (scu->flags & FLAG_DEBUG)
-      tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascdly",hz);
+      tsleep((caddr_t)scu, PCATCH, "ascdly",hz);
   lprintf("asc%d.read(after): "
       "sz 0x%x, rptr 0x%x, wptr 0x%x, cnt 0x%x bcnt 0x%x flags 0x%x icnt %ld\n",
 	  unit, scu->sbuf.size, scu->sbuf.rptr,
diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c
index 1de659f7b5..7895f5a33a 100644
--- a/sys/i386/isa/atapi.c
+++ b/sys/i386/isa/atapi.c
@@ -14,7 +14,7 @@
  * Version 1.9, Mon Oct  9 22:34:47 MSK 1995
  *
  * $FreeBSD: src/sys/i386/isa/atapi.c,v 1.36.2.1 2000/04/03 20:13:06 n_hibma Exp $
- * $DragonFly: src/sys/i386/isa/Attic/atapi.c,v 1.2 2003/06/17 04:28:36 dillon Exp $
+ * $DragonFly: src/sys/i386/isa/Attic/atapi.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  */
 
 /*
@@ -480,7 +480,7 @@ static struct atapicmd *atapi_alloc (struct atapi *ata)
 	struct atapicmd *ac;
 
 	while (! ata->free)
-		tsleep ((caddr_t)ata, PRIBIO, "atacmd", 100);
+		tsleep ((caddr_t)ata, 0, "atacmd", 100);
 	ac = ata->free;
 	ata->free = ac->next;
 	ac->busy = 1;
@@ -859,7 +859,7 @@ struct atapires atapi_request_wait (struct atapi *ata, int unit,
 	atapi_enqueue (ata, ac);
 	wdstart (ata->ctrlr);
 	if (ata->tail == ac)
-		tsleep ((caddr_t)ac, PRIBIO, "atareq", 0);
+		tsleep ((caddr_t)ac, 0, "atareq", 0);
 
 	result = ac->result;
 	atapi_free (ata, ac);
diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h
index d3beb96e89..08f1eabca9 100644
--- a/sys/i386/isa/sound/os.h
+++ b/sys/i386/isa/sound/os.h
@@ -2,7 +2,7 @@
  * os.h -- only included by sound_config.h right after local.h
  *
  * $FreeBSD: src/sys/i386/isa/sound/os.h,v 1.40.2.1 2000/08/03 01:01:27 peter Exp $
- * $DragonFly: src/sys/i386/isa/sound/Attic/os.h,v 1.2 2003/06/17 04:28:38 dillon Exp $
+ * $DragonFly: src/sys/i386/isa/sound/Attic/os.h,v 1.3 2003/07/19 21:14:36 dillon Exp $
  */
 
 #ifndef _OS_H_
@@ -57,7 +57,7 @@ typedef struct sound_os_info {
 	{ \
 	  int flag; \
 	  f.mode = WK_SLEEP; \
-	  flag=tsleep(&q, (PRIBIO-5)|PCATCH, "sndint", time_limit); \
+	  flag=tsleep(&q, PCATCH, "sndint", time_limit); \
 	  f.mode &= ~WK_SLEEP; \
 	  if (flag == EWOULDBLOCK) { \
 		f.mode |= WK_TIMEOUT; \
@@ -70,7 +70,7 @@ typedef struct sound_os_info {
 	{ \
 	  int flag; \
 	  f.mode = WK_SLEEP; \
-	  flag=tsleep(&q, (PRIBIO-5)|PCATCH, "snd1", time_limit); \
+	  flag=tsleep(&q, PCATCH, "snd1", time_limit); \
 	  f.mode &= ~WK_SLEEP; \
 	  if (flag == EWOULDBLOCK) { \
 		f.mode |= WK_TIMEOUT; \
@@ -83,7 +83,7 @@ typedef struct sound_os_info {
 	{ \
 	  int flag; \
 	  f.mode = WK_SLEEP; \
-	  flag=tsleep(&q, (PRIBIO-5)|PCATCH, "snd2", time_limit); \
+	  flag=tsleep(&q, PCATCH, "snd2", time_limit); \
 	  f.mode &= ~WK_SLEEP; \
 	  if (flag == EWOULDBLOCK) { \
 		f.mode |= WK_TIMEOUT; \
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index dc349dad9b..c1d262bae3 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
  * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.81.2.17 2003/06/06 20:21:32 tegge Exp $
- * $DragonFly: src/sys/kern/kern_descrip.c,v 1.5 2003/06/26 02:17:45 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_descrip.c,v 1.6 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include "opt_compat.h"
@@ -1158,7 +1158,7 @@ fdfree(struct proc *p)
 				 */
 				fdp->fd_holdleaderswakeup = 1;
 				tsleep(&fdp->fd_holdleaderscount,
-				       PLOCK, "fdlhold", 0);
+				       0, "fdlhold", 0);
 				goto retry;
 			}
 			if (fdtol->fdl_holdcount > 0) {
@@ -1167,7 +1167,7 @@ fdfree(struct proc *p)
 				 * remains valid in closef().
 				 */
 				fdtol->fdl_wakeup = 1;
-				tsleep(fdtol, PLOCK, "fdlhold", 0);
+				tsleep(fdtol, 0, "fdlhold", 0);
 				goto retry;
 			}
 		}
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index bbab221137..45c165a205 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/kern_event.c,v 1.2.2.9 2003/05/08 07:47:16 kbyanc Exp $
- * $DragonFly: src/sys/kern/kern_event.c,v 1.4 2003/06/25 03:55:57 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_event.c,v 1.5 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -649,7 +649,7 @@ start:
 			error = EWOULDBLOCK;
 		} else {
 			kq->kq_state |= KQ_SLEEP;
-			error = tsleep(kq, PSOCK | PCATCH, "kqread", timeout);
+			error = tsleep(kq, PCATCH, "kqread", timeout);
 		}
 		splx(s);
 		if (error == 0)
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index da1559a647..406fd478cb 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
  * $FreeBSD: src/sys/kern/kern_exit.c,v 1.92.2.11 2003/01/13 22:51:16 dillon Exp $
- * $DragonFly: src/sys/kern/kern_exit.c,v 1.17 2003/07/11 17:42:10 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_exit.c,v 1.18 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include "opt_compat.h"
@@ -141,7 +141,7 @@ exit1(int rv)
 			q = q->p_peers;
 		}
 		while (p->p_peers) 
-		  tsleep((caddr_t)p, PWAIT, "exit1", 0);
+		  tsleep((caddr_t)p, 0, "exit1", 0);
 	} 
 
 #ifdef PGINPROF
@@ -450,7 +450,7 @@ loop:
 			 * YYY no wakeup occurs so we depend on the timeout.
 			 */
 			if ((p->p_thread->td_flags & TDF_RUNNING) != 0) {
-				tsleep(p->p_thread, PWAIT, "reap", 1);
+				tsleep(p->p_thread, 0, "reap", 1);
 				goto loop;
 			}
 
@@ -464,7 +464,7 @@ loop:
 			if (p->p_lock) {
 				printf("Diagnostic: waiting for p_lock\n");
 				while (p->p_lock)
-					tsleep(p, PWAIT, "reap2", hz);
+					tsleep(p, 0, "reap2", hz);
 			}
 			lwkt_wait_free(p->p_thread);
 
@@ -567,7 +567,7 @@ loop:
 		q->p_retval[0] = 0;
 		return (0);
 	}
-	if ((error = tsleep((caddr_t)q, PWAIT | PCATCH, "wait", 0)))
+	if ((error = tsleep((caddr_t)q, PCATCH, "wait", 0)))
 		return (error);
 	goto loop;
 }
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 6b24392cc4..c8e21e2663 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_fork.c	8.6 (Berkeley) 4/8/94
  * $FreeBSD: src/sys/kern/kern_fork.c,v 1.72.2.13 2003/06/06 20:21:32 tegge Exp $
- * $DragonFly: src/sys/kern/kern_fork.c,v 1.11 2003/07/10 04:47:54 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_fork.c,v 1.12 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include "opt_ktrace.h"
@@ -234,7 +234,7 @@ fork1(p1, flags, procp)
 	 */
 	uid = p1->p_ucred->cr_ruid;
 	if ((nprocs >= maxproc - 10 && uid != 0) || nprocs >= maxproc) {
-		tsleep(&forksleep, PUSER, "fork", hz / 2);
+		tsleep(&forksleep, 0, "fork", hz / 2);
 		return (EAGAIN);
 	}
 	/*
@@ -254,7 +254,7 @@ fork1(p1, flags, procp)
 		 * Back out the process count
 		 */
 		nprocs--;
-		tsleep(&forksleep, PUSER, "fork", hz / 2);
+		tsleep(&forksleep, 0, "fork", hz / 2);
 		return (EAGAIN);
 	}
 
@@ -634,6 +634,6 @@ start_forked_proc(struct proc *p1, struct proc *p2)
 	 * proc (in case of exit).
 	 */
 	while (p2->p_flag & P_PPWAIT)
-		tsleep(p1, PWAIT, "ppwait", 0);
+		tsleep(p1, 0, "ppwait", 0);
 }
 
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index 7e84535d82..a81cb10702 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/kern_kthread.c,v 1.5.2.3 2001/12/25 01:51:14 dillon Exp $
- * $DragonFly: src/sys/kern/kern_kthread.c,v 1.8 2003/06/30 19:50:31 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_kthread.c,v 1.9 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -71,7 +71,7 @@ suspend_kproc(struct thread *td, int timo)
 		td->td_flags |= TDF_STOPREQ;	/* request thread pause */
 		wakeup(td);
 		while (td->td_flags & TDF_STOPREQ) {
-			int error = tsleep(td, PPAUSE, "suspkp", timo);
+			int error = tsleep(td, 0, "suspkp", timo);
 			if (error == EWOULDBLOCK)
 				break;
 		}
@@ -91,7 +91,7 @@ kproc_suspend_loop(void)
 		td->td_flags &= ~TDF_STOPREQ;
 		while ((td->td_flags & TDF_WAKEREQ) == 0) {
 			wakeup(td);
-			tsleep(td, PPAUSE, "kpsusp", 0);
+			tsleep(td, 0, "kpsusp", 0);
 		}
 		td->td_flags &= ~TDF_WAKEREQ;
 		wakeup(td);
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 0b358183b7..c845087e94 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/kern_linker.c,v 1.41.2.3 2001/11/21 17:50:35 luigi Exp $
- * $DragonFly: src/sys/kern/kern_linker.c,v 1.7 2003/07/18 05:12:39 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_linker.c,v 1.8 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include "opt_ddb.h"
@@ -63,7 +63,7 @@ static int next_file_id = 1;
 static void
 linker_init(void* arg)
 {
-    lockinit(&lock, PVM, "klink", 0, 0);
+    lockinit(&lock, 0, "klink", 0, 0);
     TAILQ_INIT(&classes);
     TAILQ_INIT(&linker_files);
 }
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index 5f5e3f984b..b6b4326d44 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -35,7 +35,7 @@
  *
  *	@(#)ufs_lockf.c	8.3 (Berkeley) 1/6/94
  * $FreeBSD: src/sys/kern/kern_lockf.c,v 1.25 1999/11/16 16:28:56 phk Exp $
- * $DragonFly: src/sys/kern/kern_lockf.c,v 1.2 2003/06/17 04:28:41 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_lockf.c,v 1.3 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include "opt_debug_lockf.h"
@@ -192,20 +192,13 @@ lf_setlock(lock)
 	struct lockf **head = lock->lf_head;
 	struct lockf **prev, *overlap, *ltmp;
 	static char lockstr[] = "lockf";
-	int ovcase, priority, needtolink, error;
+	int ovcase, needtolink, error;
 
 #ifdef LOCKF_DEBUG
 	if (lockf_debug & 1)
 		lf_print("lf_setlock", lock);
 #endif /* LOCKF_DEBUG */
 
-	/*
-	 * Set the priority
-	 */
-	priority = PLOCK;
-	if (lock->lf_type == F_WRLCK)
-		priority += 4;
-	priority |= PCATCH;
 	/*
 	 * Scan lock list for this file looking for locks that would block us.
 	 */
@@ -273,7 +266,7 @@ lf_setlock(lock)
 			lf_printlist("lf_setlock", block);
 		}
 #endif /* LOCKF_DEBUG */
-		error = tsleep((caddr_t)lock, priority, lockstr, 0);
+		error = tsleep((caddr_t)lock, PCATCH, lockstr, 0);
 		/*
 		 * We may have been awakened by a signal and/or by a
 		 * debugger continuing us (in which cases we must remove
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index b240c6bbda..19dfb26b29 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/kern/kern_malloc.c,v 1.64.2.5 2002/03/16 02:19:51 archie Exp $
- * $DragonFly: src/sys/kern/Attic/kern_malloc.c,v 1.6 2003/07/10 04:47:54 dillon Exp $
+ * $DragonFly: src/sys/kern/Attic/kern_malloc.c,v 1.7 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include "opt_vm.h"
@@ -176,7 +176,7 @@ malloc(size, type, flags)
 		}
 		if (ksp->ks_limblocks < 65535)
 			ksp->ks_limblocks++;
-		tsleep((caddr_t)ksp, PSWP+2, type->ks_shortdesc, 0);
+		tsleep((caddr_t)ksp, 0, type->ks_shortdesc, 0);
 	}
 	ksp->ks_size |= 1 << indx;
 #ifdef INVARIANTS
diff --git a/sys/kern/kern_memio.c b/sys/kern/kern_memio.c
index e962f09f66..58ea83fff4 100644
--- a/sys/kern/kern_memio.c
+++ b/sys/kern/kern_memio.c
@@ -39,7 +39,7 @@
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $
- * $DragonFly: src/sys/kern/kern_memio.c,v 1.5 2003/07/04 05:57:25 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_memio.c,v 1.6 2003/07/19 21:14:33 dillon Exp $
  */
 
 /*
@@ -253,8 +253,7 @@ mmrw(dev, uio, flags)
 				 * Use tsleep() to get the error code right.
 				 * It should return immediately.
 				 */
-				error = tsleep(&rand_bolt,
-				    PZERO | PCATCH, "urand", 1);
+				error = tsleep(&rand_bolt, PCATCH, "urand", 1);
 				if (error != 0 && error != EWOULDBLOCK)
 					continue;
 			}
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index c428eac24b..61553571b6 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -17,7 +17,7 @@
  *    are met.
  *
  * $FreeBSD: src/sys/kern/kern_physio.c,v 1.46.2.3 2003/05/29 06:15:35 alc Exp $
- * $DragonFly: src/sys/kern/kern_physio.c,v 1.3 2003/06/26 20:27:51 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_physio.c,v 1.4 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -111,7 +111,7 @@ physio(dev_t dev, struct uio *uio, int ioflag)
 			BUF_STRATEGY(bp, 0);
 			spl = splbio();
 			while ((bp->b_flags & B_DONE) == 0)
-				tsleep((caddr_t)bp, PRIBIO, "physstr", 0);
+				tsleep((caddr_t)bp, 0, "physstr", 0);
 			splx(spl);
 
 			if (uio->uio_segflg == UIO_USERSPACE)
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index e2213c49ba..b189eb3ac4 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
  * $FreeBSD: src/sys/kern/kern_sig.c,v 1.72.2.17 2003/05/16 16:34:34 obrien Exp $
- * $DragonFly: src/sys/kern/kern_sig.c,v 1.10 2003/07/12 17:54:35 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_sig.c,v 1.11 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include "opt_compat.h"
@@ -690,7 +690,7 @@ sigsuspend(struct sigsuspend_args *uap)
 
 	SIG_CANTMASK(mask);
 	p->p_sigmask = mask;
-	while (tsleep((caddr_t) ps, PPAUSE|PCATCH, "pause", 0) == 0)
+	while (tsleep((caddr_t) ps, PCATCH, "pause", 0) == 0)
 		/* void */;
 	/* always return EINTR rather than ERESTART... */
 	return (EINTR);
@@ -714,7 +714,7 @@ osigsuspend(struct osigsuspend_args *uap)
 	OSIG2SIG(uap->mask, mask);
 	SIG_CANTMASK(mask);
 	SIGSETLO(p->p_sigmask, mask);
-	while (tsleep((caddr_t) ps, PPAUSE|PCATCH, "opause", 0) == 0)
+	while (tsleep((caddr_t) ps, PCATCH, "opause", 0) == 0)
 		/* void */;
 	/* always return EINTR rather than ERESTART... */
 	return (EINTR);
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 66a3ff5ade..2a83e3afad 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_synch.c	8.9 (Berkeley) 5/19/95
  * $FreeBSD: src/sys/kern/kern_synch.c,v 1.87.2.6 2002/10/13 07:29:53 kbyanc Exp $
- * $DragonFly: src/sys/kern/kern_synch.c,v 1.18 2003/07/11 17:42:10 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_synch.c,v 1.19 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include "opt_ktrace.h"
@@ -385,7 +385,7 @@ sleepinit(void)
  * General sleep call.  Suspends the current process until a wakeup is
  * performed on the specified identifier.  The process will then be made
  * runnable with the specified priority.  Sleeps at most timo/hz seconds
- * (0 means no timeout).  If pri includes PCATCH flag, signals are checked
+ * (0 means no timeout).  If flags includes PCATCH flag, signals are checked
  * before and after sleeping, else signals are not checked.  Returns 0 if
  * awakened, EWOULDBLOCK if the timeout expires.  If PCATCH is set and a
  * signal needs to be delivered, ERESTART is returned if the current system
@@ -400,14 +400,14 @@ sleepinit(void)
  * YYY priority now unused
  */
 int
-tsleep(ident, priority, wmesg, timo)
+tsleep(ident, flags, wmesg, timo)
 	void *ident;
-	int priority, timo;
+	int flags, timo;
 	const char *wmesg;
 {
 	struct thread *td = curthread;
 	struct proc *p = td->td_proc;		/* may be NULL */
-	int s, sig = 0, catch = priority & PCATCH;
+	int s, sig = 0, catch = flags & PCATCH;
 	int id = LOOKUP(ident);
 	struct callout_handle thandle;
 
@@ -506,130 +506,6 @@ resume:
 	return (0);
 }
 
-#if 0
-
-/*
- * General sleep call.  Suspends the current process until a wakeup is
- * performed on the specified xwait structure.  The process will then be made
- * runnable with the specified priority.  Sleeps at most timo/hz seconds
- * (0 means no timeout).  If pri includes PCATCH flag, signals are checked
- * before and after sleeping, else signals are not checked.  Returns 0 if
- * awakened, EWOULDBLOCK if the timeout expires.  If PCATCH is set and a
- * signal needs to be delivered, ERESTART is returned if the current system
- * call should be restarted if possible, and EINTR is returned if the system
- * call should be interrupted by the signal (return EINTR).
- *
- * If the passed generation number is different from the generation number
- * in the xwait, return immediately.
- */
-int
-xsleep(struct xwait *w, int priority, const char *wmesg, int timo, int *gen)
-{
-	struct thread *td = curthread;
-	struct proc *p = td->td_proc;
-	int s, sig, catch = priority & PCATCH;
-	struct callout_handle thandle;
-
-#ifdef KTRACE
-	if (KTRPOINT(td, KTR_CSW))
-		ktrcsw(p->p_tracep, 1, 0);
-#endif
-	if (cold || panicstr) {
-		/*
-		 * After a panic, or during autoconfiguration,
-		 * just give interrupts a chance, then just return;
-		 * don't run any other procs or panic below,
-		 * in case this is the idle process and already asleep.
-		 */
-		crit_panicints();
-		return (0);
-	}
-	s = splhigh();
-	KASSERT(p != NULL, ("xsleep1"));
-	KASSERT(w != NULL && p->p_stat == SRUN, ("xsleep"));
-
-	/*
-	 * If the generation number does not match we return immediately.
-	 */
-	if (*gen != w->gen) {
-		*gen = w->gen;
-		splx(s);
-#ifdef KTRACE
-		if (KTRPOINT(td, KTR_CSW))
-			ktrcsw(p->p_tracep, 0, 0);
-#endif
-		return(0);
-	}
-
-	p->p_wchan = w;
-	p->p_wmesg = wmesg;
-	p->p_slptime = 0;
-	p->p_flag |= P_XSLEEP;
-	TAILQ_INSERT_TAIL(&w->waitq, p, p_procq);
-	if (timo)
-		thandle = timeout(endtsleep, (void *)p, timo);
-	/*
-	 * We put ourselves on the sleep queue and start our timeout
-	 * before calling CURSIG, as we could stop there, and a wakeup
-	 * or a SIGCONT (or both) could occur while we were stopped.
-	 * A SIGCONT would cause us to be marked as SSLEEP
-	 * without resuming us, thus we must be ready for sleep
-	 * when CURSIG is called.  If the wakeup happens while we're
-	 * stopped, p->p_wchan will be 0 upon return from CURSIG.
-	 */
-	if (catch) {
-		p->p_flag |= P_SINTR;
-		if ((sig = CURSIG(p))) {
-			if (p->p_wchan) {
-				unsleep(p);
-				lwkt_schedule_self();
-			}
-			p->p_stat = SRUN;
-			goto resume;
-		}
-		if (p->p_wchan == NULL) {
-			catch = 0;
-			goto resume;
-		}
-	} else {
-		sig = 0;
-	}
-	clrrunnable(p, SSLEEP);
-	p->p_stats->p_ru.ru_nvcsw++;
-	mi_switch();
-resume:
-	*gen = w->gen;	/* update generation number */
-	splx(s);
-	p->p_flag &= ~P_SINTR;
-	if (p->p_flag & P_TIMEOUT) {
-		p->p_flag &= ~P_TIMEOUT;
-		if (sig == 0) {
-#ifdef KTRACE
-			if (KTRPOINT(td, KTR_CSW))
-				ktrcsw(p->p_tracep, 0, 0);
-#endif
-			return (EWOULDBLOCK);
-		}
-	} else if (timo)
-		untimeout(endtsleep, (void *)p, thandle);
-	if (catch && (sig != 0 || (sig = CURSIG(p)))) {
-#ifdef KTRACE
-		if (KTRPOINT(td, KTR_CSW))
-			ktrcsw(p->p_tracep, 0, 0);
-#endif
-		if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig))
-			return (EINTR);
-		return (ERESTART);
-	}
-#ifdef KTRACE
-	if (KTRPOINT(td, KTR_CSW))
-		ktrcsw(p->p_tracep, 0, 0);
-#endif
-	return (0);
-}
-
-#endif
-
 /*
  * Implement the timeout for tsleep.  We interlock against
  * wchan when setting TDF_TIMEOUT.  For processes we remove
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 426502fe2c..c812cb1360 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -38,7 +38,7 @@
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
  * $FreeBSD: src/sys/kern/kern_sysctl.c,v 1.92.2.9 2003/05/01 22:48:09 trhodes Exp $
- * $DragonFly: src/sys/kern/kern_sysctl.c,v 1.6 2003/06/30 19:50:31 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_sysctl.c,v 1.7 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include "opt_compat.h"
@@ -930,7 +930,7 @@ kernel_sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, void *new, s
 	/* XXX this should probably be done in a general way */
 	while (memlock.sl_lock) {
 		memlock.sl_want = 1;
-		(void) tsleep((caddr_t)&memlock, PRIBIO+1, "sysctl", 0);
+		(void) tsleep((caddr_t)&memlock, 0, "sysctl", 0);
 		memlock.sl_locked++;
 	}
 	memlock.sl_lock = 1;
@@ -1193,7 +1193,7 @@ userland_sysctl(int *name, u_int namelen, void *old, size_t *oldlenp, int inkern
 	/* XXX this should probably be done in a general way */
 	while (memlock.sl_lock) {
 		memlock.sl_want = 1;
-		(void) tsleep((caddr_t)&memlock, PRIBIO+1, "sysctl", 0);
+		(void) tsleep((caddr_t)&memlock, 0, "sysctl", 0);
 		memlock.sl_locked++;
 	}
 	memlock.sl_lock = 1;
diff --git a/sys/kern/kern_threads.c b/sys/kern/kern_threads.c
index a84d9abf37..23ba0a40d7 100644
--- a/sys/kern/kern_threads.c
+++ b/sys/kern/kern_threads.c
@@ -47,7 +47,7 @@
  * and I certainly make no claims as to its fitness for *any* purpose.
  * 
  * $FreeBSD: src/sys/kern/kern_threads.c,v 1.15 1999/08/28 00:46:15 peter Exp $
- * $DragonFly: src/sys/kern/kern_threads.c,v 1.4 2003/06/30 19:50:31 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_threads.c,v 1.5 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -103,7 +103,7 @@ thr_sleep(struct thr_sleep_args *uap)
 	if (p->p_wakeup == 0) {
 		sleepstart = ticks;
 		p->p_flag |= P_SINTR;
-		error = tsleep(p, PRIBIO, "thrslp", timo);
+		error = tsleep(p, 0, "thrslp", timo);
 		p->p_flag &= ~P_SINTR;
 		if (error == EWOULDBLOCK) {
 			p->p_wakeup = 0;
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 7d761599d1..4eb9577193 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -32,7 +32,7 @@
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/kern/kern_time.c,v 1.68.2.1 2002/10/01 08:00:41 bde Exp $
- * $DragonFly: src/sys/kern/kern_time.c,v 1.4 2003/06/25 03:55:57 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_time.c,v 1.5 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -233,7 +233,7 @@ nanosleep1(struct timespec *rqt, struct timespec *rmt)
 	timespecadd(&ts, rqt);
 	TIMESPEC_TO_TIMEVAL(&tv, rqt);
 	for (;;) {
-		error = tsleep(&nanowait, PWAIT | PCATCH, "nanslp",
+		error = tsleep(&nanowait, PCATCH, "nanslp",
 		    tvtohz(&tv));
 		getnanouptime(&ts2);
 		if (error != EWOULDBLOCK) {
diff --git a/sys/kern/lwkt_thread.c b/sys/kern/lwkt_thread.c
index 84f5579866..770ef2b6d3 100644
--- a/sys/kern/lwkt_thread.c
+++ b/sys/kern/lwkt_thread.c
@@ -28,7 +28,7 @@
  *	to use a critical section to avoid problems.  Foreign thread 
  *	scheduling is queued via (async) IPIs.
  *
- * $DragonFly: src/sys/kern/lwkt_thread.c,v 1.23 2003/07/12 17:54:35 dillon Exp $
+ * $DragonFly: src/sys/kern/lwkt_thread.c,v 1.24 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -231,7 +231,7 @@ void
 lwkt_wait_free(thread_t td)
 {
     while (td->td_refs)
-	tsleep(td, PWAIT, "tdreap", hz);
+	tsleep(td, 0, "tdreap", hz);
 }
 
 void
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index ec70a1a4c4..ef9e81f22a 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -42,7 +42,7 @@
  *	@(#)subr_autoconf.c	8.1 (Berkeley) 6/10/93
  *
  * $FreeBSD: src/sys/kern/subr_autoconf.c,v 1.14 1999/10/05 21:19:41 n_hibma Exp $
- * $DragonFly: src/sys/kern/subr_autoconf.c,v 1.2 2003/06/17 04:28:41 dillon Exp $
+ * $DragonFly: src/sys/kern/subr_autoconf.c,v 1.3 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -76,7 +76,7 @@ run_interrupt_driven_config_hooks(dummy)
 	}
 
 	while (!TAILQ_EMPTY(&intr_config_hook_list)) {
-		tsleep(&intr_config_hook_list, PCONFIG, "conifhk", 0);
+		tsleep(&intr_config_hook_list, 0, "conifhk", 0);
 	}
 }
 SYSINIT(intr_config_hooks, SI_SUB_INT_CONFIG_HOOKS, SI_ORDER_FIRST,
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index c434173415..17a1cb71a8 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -7,7 +7,7 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/kern/subr_disk.c,v 1.20.2.6 2001/10/05 07:14:57 peter Exp $
- * $DragonFly: src/sys/kern/subr_disk.c,v 1.3 2003/06/23 17:55:41 dillon Exp $
+ * $DragonFly: src/sys/kern/subr_disk.c,v 1.4 2003/07/19 21:14:38 dillon Exp $
  *
  */
 
@@ -176,7 +176,7 @@ diskopen(dev_t dev, int oflags, int devtype, struct thread *td)
 
 	while (dp->d_flags & DISKFLAG_LOCK) {
 		dp->d_flags |= DISKFLAG_WANTED;
-		error = tsleep(dp, PRIBIO | PCATCH, "diskopen", hz);
+		error = tsleep(dp, PCATCH, "diskopen", hz);
 		if (error)
 			return (error);
 	}
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index fa608aa021..539c29a426 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -32,7 +32,7 @@
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/kern/subr_log.c,v 1.39.2.2 2001/06/02 08:11:25 phk Exp $
- * $DragonFly: src/sys/kern/subr_log.c,v 1.3 2003/06/23 17:55:41 dillon Exp $
+ * $DragonFly: src/sys/kern/subr_log.c,v 1.4 2003/07/19 21:14:38 dillon Exp $
  */
 
 /*
@@ -53,8 +53,6 @@
 #include <sys/filedesc.h>
 #include <sys/sysctl.h>
 
-#define LOG_RDPRI	(PZERO + 1)
-
 #define LOG_ASYNC	0x04
 #define LOG_RDWAIT	0x08
 
@@ -143,8 +141,7 @@ logread(dev_t dev, struct uio *uio, int flag)
 			return (EWOULDBLOCK);
 		}
 		logsoftc.sc_state |= LOG_RDWAIT;
-		if ((error = tsleep((caddr_t)mbp, LOG_RDPRI | PCATCH,
-		    "klog", 0))) {
+		if ((error = tsleep((caddr_t)mbp, PCATCH, "klog", 0))) {
 			splx(s);
 			return (error);
 		}
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c
index 3f0b2cd28a..3ebda82f09 100644
--- a/sys/kern/subr_rman.c
+++ b/sys/kern/subr_rman.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/subr_rman.c,v 1.10.2.1 2001/06/05 08:06:08 imp Exp $
- * $DragonFly: src/sys/kern/subr_rman.c,v 1.3 2003/07/06 21:23:51 dillon Exp $
+ * $DragonFly: src/sys/kern/subr_rman.c,v 1.4 2003/07/19 21:14:38 dillon Exp $
  */
 
 /*
@@ -451,7 +451,7 @@ rman_activate_resource(struct resource *r)
 }
 
 int
-rman_await_resource(struct resource *r, int pri, int timo)
+rman_await_resource(struct resource *r, int slpflags, int timo)
 {
 	int	rv, s;
 	struct	resource *whohas;
@@ -475,7 +475,7 @@ rman_await_resource(struct resource *r, int pri, int timo)
 		s = splhigh();
 		whohas->r_flags |= RF_WANTED;
 		lwkt_reltoken(rm->rm_slock);	/* YYY */
-		rv = tsleep(r->r_sharehead, pri, "rmwait", timo);
+		rv = tsleep(r->r_sharehead, slpflags, "rmwait", timo);
 		if (rv) {
 			splx(s);
 			return rv;
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 8e6c140b7f..c8b441d9fb 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -37,7 +37,7 @@
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/sys_generic.c,v 1.55.2.10 2001/03/17 10:39:32 peter Exp $
- * $DragonFly: src/sys/kern/sys_generic.c,v 1.5 2003/06/27 01:53:25 dillon Exp $
+ * $DragonFly: src/sys/kern/sys_generic.c,v 1.6 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include "opt_ktrace.h"
@@ -776,7 +776,7 @@ retry:
 	}
 	p->p_flag &= ~P_SELECT;
 
-	error = tsleep((caddr_t)&selwait, PSOCK | PCATCH, "select", timo);
+	error = tsleep((caddr_t)&selwait, PCATCH, "select", timo);
 	
 	splx(s);
 	if (error == 0)
@@ -914,7 +914,7 @@ retry:
 		goto retry;
 	}
 	p->p_flag &= ~P_SELECT;
-	error = tsleep((caddr_t)&selwait, PSOCK | PCATCH, "poll", timo);
+	error = tsleep((caddr_t)&selwait, PCATCH, "poll", timo);
 	splx(s);
 	if (error == 0)
 		goto retry;
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 25297ef0cf..c63a154035 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -17,7 +17,7 @@
  *    are met.
  *
  * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.60.2.13 2002/08/05 15:05:15 des Exp $
- * $DragonFly: src/sys/kern/sys_pipe.c,v 1.4 2003/06/25 03:55:57 dillon Exp $
+ * $DragonFly: src/sys/kern/sys_pipe.c,v 1.5 2003/07/19 21:14:39 dillon Exp $
  */
 
 /*
@@ -353,8 +353,7 @@ pipelock(cpipe, catch)
 
 	while (cpipe->pipe_state & PIPE_LOCK) {
 		cpipe->pipe_state |= PIPE_LWANT;
-		error = tsleep(cpipe, catch ? (PRIBIO | PCATCH) : PRIBIO,
-		    "pipelk", 0);
+		error = tsleep(cpipe, (catch ? PCATCH : 0), "pipelk", 0);
 		if (error != 0) 
 			return (error);
 	}
@@ -498,9 +497,10 @@ pipe_read(struct file *fp, struct uio *uio, struct ucred *cred,
 				error = EAGAIN;
 			} else {
 				rpipe->pipe_state |= PIPE_WANTR;
-				if ((error = tsleep(rpipe, PRIBIO | PCATCH,
-				    "piperd", 0)) == 0)
+				if ((error = tsleep(rpipe, PCATCH,
+				    "piperd", 0)) == 0) {
 					error = pipelock(rpipe, 1);
+				}
 			}
 			if (error)
 				goto unlocked_error;
@@ -679,7 +679,7 @@ retry:
 			wakeup(wpipe);
 		}
 		wpipe->pipe_state |= PIPE_WANTW;
-		error = tsleep(wpipe, PRIBIO | PCATCH, "pipdww", 0);
+		error = tsleep(wpipe, PCATCH, "pipdww", 0);
 		if (error)
 			goto error1;
 		if (wpipe->pipe_state & PIPE_EOF) {
@@ -695,7 +695,7 @@ retry:
 		}
 			
 		wpipe->pipe_state |= PIPE_WANTW;
-		error = tsleep(wpipe, PRIBIO | PCATCH, "pipdwc", 0);
+		error = tsleep(wpipe, PCATCH, "pipdwc", 0);
 		if (error)
 			goto error1;
 		if (wpipe->pipe_state & PIPE_EOF) {
@@ -728,7 +728,7 @@ retry:
 			wakeup(wpipe);
 		}
 		pipeselwakeup(wpipe);
-		error = tsleep(wpipe, PRIBIO | PCATCH, "pipdwt", 0);
+		error = tsleep(wpipe, PCATCH, "pipdwt", 0);
 	}
 
 	pipelock(wpipe,0);
@@ -841,7 +841,7 @@ pipe_write(struct file *fp, struct uio *uio, struct ucred *cred,
 				wpipe->pipe_state &= ~PIPE_WANTR;
 				wakeup(wpipe);
 			}
-			error = tsleep(wpipe, PRIBIO | PCATCH, "pipbww", 0);
+			error = tsleep(wpipe, PCATCH, "pipbww", 0);
 			if (wpipe->pipe_state & PIPE_EOF)
 				break;
 			if (error)
@@ -965,7 +965,7 @@ pipe_write(struct file *fp, struct uio *uio, struct ucred *cred,
 			pipeselwakeup(wpipe);
 
 			wpipe->pipe_state |= PIPE_WANTW;
-			error = tsleep(wpipe, PRIBIO | PCATCH, "pipewr", 0);
+			error = tsleep(wpipe, PCATCH, "pipewr", 0);
 			if (error != 0)
 				break;
 			/*
@@ -1185,7 +1185,7 @@ pipeclose(struct pipe *cpipe)
 		while (cpipe->pipe_busy) {
 			wakeup(cpipe);
 			cpipe->pipe_state |= PIPE_WANT | PIPE_EOF;
-			tsleep(cpipe, PRIBIO, "pipecl", 0);
+			tsleep(cpipe, 0, "pipecl", 0);
 		}
 
 		/*
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index adc250f22b..8f6b954304 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/sys_process.c,v 1.51.2.6 2003/01/08 03:06:45 kan Exp $
- * $DragonFly: src/sys/kern/sys_process.c,v 1.5 2003/07/10 04:47:54 dillon Exp $
+ * $DragonFly: src/sys/kern/sys_process.c,v 1.6 2003/07/19 21:14:39 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -630,7 +630,7 @@ stopevent(struct proc *p, unsigned int event, unsigned int val)
 		wakeup(&p->p_stype);	/* Wake up any PIOCWAIT'ing procs */
 		p->p_xstat = val;
 		p->p_stype = event;	/* Which event caused the stop? */
-		tsleep(&p->p_step, PWAIT, "stopevent", 0);
+		tsleep(&p->p_step, 0, "stopevent", 0);
 		crit_exit();
 	} while (p->p_step);
 }
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 731c5c3983..d1311e444e 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/kern/sysv_msg.c,v 1.23.2.5 2002/12/31 08:54:53 maxim Exp $ */
-/* $DragonFly: src/sys/kern/sysv_msg.c,v 1.4 2003/06/25 03:55:57 dillon Exp $ */
+/* $DragonFly: src/sys/kern/sysv_msg.c,v 1.5 2003/07/19 21:14:39 dillon Exp $ */
 
 /*
  * Implementation of SVID messages
@@ -619,8 +619,7 @@ msgsnd(struct msgsnd_args *uap)
 #ifdef MSG_DEBUG_OK
 			printf("goodnight\n");
 #endif
-			eval = tsleep((caddr_t)msqptr, (PZERO - 4) | PCATCH,
-			    "msgwait", 0);
+			eval = tsleep((caddr_t)msqptr, PCATCH, "msgwait", 0);
 #ifdef MSG_DEBUG_OK
 			printf("good morning, eval=%d\n", eval);
 #endif
@@ -984,8 +983,7 @@ msgrcv(struct msgrcv_args *uap)
 #ifdef MSG_DEBUG_OK
 		printf("msgrcv:  goodnight\n");
 #endif
-		eval = tsleep((caddr_t)msqptr, (PZERO - 4) | PCATCH, "msgwait",
-		    0);
+		eval = tsleep((caddr_t)msqptr, PCATCH, "msgwait", 0);
 #ifdef MSG_DEBUG_OK
 		printf("msgrcv:  good morning (eval=%d)\n", eval);
 #endif
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index e309ecc740..88b565c2a5 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/kern/sysv_sem.c,v 1.24.2.8 2002/10/22 20:45:03 fjoe Exp $ */
-/* $DragonFly: src/sys/kern/sysv_sem.c,v 1.3 2003/06/23 17:55:41 dillon Exp $ */
+/* $DragonFly: src/sys/kern/sysv_sem.c,v 1.4 2003/07/19 21:14:39 dillon Exp $ */
 
 /*
  * Implementation of SVID semaphores
@@ -824,8 +824,7 @@ semop(struct semop_args *uap)
 #ifdef SEM_DEBUG
 		printf("semop:  good night!\n");
 #endif
-		eval = tsleep((caddr_t)semaptr, (PZERO - 4) | PCATCH,
-		    "semwait", 0);
+		eval = tsleep((caddr_t)semaptr, PCATCH, "semwait", 0);
 #ifdef SEM_DEBUG
 		printf("semop:  good morning (eval=%d)!\n", eval);
 #endif
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index d268030133..ba9f6f8c7b 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/kern/sysv_shm.c,v 1.45.2.6 2002/10/22 20:45:03 fjoe Exp $ */
-/* $DragonFly: src/sys/kern/sysv_shm.c,v 1.3 2003/06/23 17:55:41 dillon Exp $ */
+/* $DragonFly: src/sys/kern/sysv_shm.c,v 1.4 2003/07/19 21:14:39 dillon Exp $ */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
 /*
@@ -485,7 +485,7 @@ shmget_existing(p, uap, mode, segnum)
 		 * allocation failed or it was freed).
 		 */
 		shmseg->shm_perm.mode |= SHMSEG_WANTED;
-		error = tsleep((caddr_t)shmseg, PLOCK | PCATCH, "shmget", 0);
+		error = tsleep((caddr_t)shmseg, PCATCH, "shmget", 0);
 		if (error)
 			return error;
 		return EAGAIN;
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index aecffaa50c..e53938510d 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -37,7 +37,7 @@
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/tty.c,v 1.129.2.5 2002/03/11 01:32:31 dd Exp $
- * $DragonFly: src/sys/kern/tty.c,v 1.4 2003/06/25 03:55:57 dillon Exp $
+ * $DragonFly: src/sys/kern/tty.c,v 1.5 2003/07/19 21:14:39 dillon Exp $
  */
 
 /*-
@@ -748,7 +748,7 @@ ttioctl(struct tty *tp, u_long cmd, void *data, int flag)
 			if (p->p_pgrp->pg_jobc == 0)
 				return (EIO);
 			pgsignal(p->p_pgrp, SIGTTOU, 1);
-			error = ttysleep(tp, &lbolt, TTOPRI | PCATCH, "ttybg1",
+			error = ttysleep(tp, &lbolt, PCATCH, "ttybg1",
 					 0);
 			if (error)
 				return (error);
@@ -1209,7 +1209,7 @@ ttywait(tp)
 		    ISSET(tp->t_state, TS_CONNECTED)) {
 			SET(tp->t_state, TS_SO_OCOMPLETE);
 			error = ttysleep(tp, TSA_OCOMPLETE(tp),
-					 TTOPRI | PCATCH, "ttywai",
+					 PCATCH, "ttywai",
 					 tp->t_timeout);
 			if (error) {
 				if (error == EWOULDBLOCK)
@@ -1292,7 +1292,7 @@ again:
 				 * will save us.
 				 */
 				SET(tp->t_state, TS_SO_OCOMPLETE);
-				ttysleep(tp, TSA_OCOMPLETE(tp), TTOPRI,
+				ttysleep(tp, TSA_OCOMPLETE(tp), 0,
 					 "ttyfls", hz / 10);
 				/*
 				 * Don't try sending the stop character again.
@@ -1538,7 +1538,7 @@ loop:
 		    (p->p_flag & P_PPWAIT) || p->p_pgrp->pg_jobc == 0)
 			return (EIO);
 		pgsignal(p->p_pgrp, SIGTTIN, 1);
-		error = ttysleep(tp, &lbolt, TTIPRI | PCATCH, "ttybg2", 0);
+		error = ttysleep(tp, &lbolt, PCATCH, "ttybg2", 0);
 		if (error)
 			return (error);
 		goto loop;
@@ -1650,7 +1650,7 @@ sleep:
 		/*
 		 * There is no input, or not enough input and we can block.
 		 */
-		error = ttysleep(tp, TSA_HUP_OR_INPUT(tp), TTIPRI | PCATCH,
+		error = ttysleep(tp, TSA_HUP_OR_INPUT(tp), PCATCH,
 				 ISSET(tp->t_state, TS_CONNECTED) ?
 				 "ttyin" : "ttyhup", (int)slp);
 		splx(s);
@@ -1713,7 +1713,7 @@ slowcase:
 		    ISSET(lflag, IEXTEN | ISIG) == (IEXTEN | ISIG)) {
 			pgsignal(tp->t_pgrp, SIGTSTP, 1);
 			if (first) {
-				error = ttysleep(tp, &lbolt, TTIPRI | PCATCH,
+				error = ttysleep(tp, &lbolt, PCATCH,
 						 "ttybg3", 0);
 				if (error)
 					break;
@@ -1788,7 +1788,7 @@ ttycheckoutq(tp, wait)
 				return (0);
 			}
 			SET(tp->t_state, TS_SO_OLOWAT);
-			tsleep(TSA_OLOWAT(tp), PZERO - 1, "ttoutq", hz);
+			tsleep(TSA_OLOWAT(tp), 0, "ttoutq", hz);
 		}
 	splx(s);
 	return (1);
@@ -1827,8 +1827,7 @@ loop:
 			error = EWOULDBLOCK;
 			goto out;
 		}
-		error = ttysleep(tp, TSA_CARR_ON(tp), TTIPRI | PCATCH,
-				 "ttydcd", 0);
+		error = ttysleep(tp, TSA_CARR_ON(tp), PCATCH, "ttydcd", 0);
 		splx(s);
 		if (error)
 			goto out;
@@ -1848,7 +1847,7 @@ loop:
 			goto out;
 		}
 		pgsignal(p->p_pgrp, SIGTTOU, 1);
-		error = ttysleep(tp, &lbolt, TTIPRI | PCATCH, "ttybg4", 0);
+		error = ttysleep(tp, &lbolt, PCATCH, "ttybg4", 0);
 		if (error)
 			goto out;
 		goto loop;
@@ -1907,7 +1906,7 @@ loop:
 							goto out;
 						}
 						error = ttysleep(tp, &lbolt,
-								 TTOPRI|PCATCH,
+								 PCATCH,
 								 "ttybf1", 0);
 						if (error)
 							goto out;
@@ -1942,7 +1941,7 @@ loop:
 					error = EWOULDBLOCK;
 					goto out;
 				}
-				error = ttysleep(tp, &lbolt, TTOPRI | PCATCH,
+				error = ttysleep(tp, &lbolt, PCATCH,
 						 "ttybf2", 0);
 				if (error)
 					goto out;
@@ -1980,8 +1979,7 @@ ovhiwat:
 		return (uio->uio_resid == cnt ? EWOULDBLOCK : 0);
 	}
 	SET(tp->t_state, TS_SO_OLOWAT);
-	error = ttysleep(tp, TSA_OLOWAT(tp), TTOPRI | PCATCH, "ttywri",
-			 tp->t_timeout);
+	error = ttysleep(tp, TSA_OLOWAT(tp), PCATCH, "ttywri", tp->t_timeout);
 	splx(s);
 	if (error == EWOULDBLOCK)
 		error = EIO;
@@ -2446,17 +2444,17 @@ tputchar(c, tp)
  * at the start of the call.
  */
 int
-ttysleep(tp, chan, pri, wmesg, timo)
+ttysleep(tp, chan, slpflags, wmesg, timo)
 	struct tty *tp;
 	void *chan;
-	int pri, timo;
+	int slpflags, timo;
 	char *wmesg;
 {
 	int error;
 	int gen;
 
 	gen = tp->t_gen;
-	error = tsleep(chan, pri, wmesg, timo);
+	error = tsleep(chan, slpflags, wmesg, timo);
 	if (error)
 		return (error);
 	return (tp->t_gen == gen ? 0 : ERESTART);
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 142d90fbf0..b200639f27 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -32,7 +32,7 @@
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
  * $FreeBSD: src/sys/kern/tty_pty.c,v 1.74.2.4 2002/02/20 19:58:13 dillon Exp $
- * $DragonFly: src/sys/kern/tty_pty.c,v 1.4 2003/06/25 03:55:57 dillon Exp $
+ * $DragonFly: src/sys/kern/tty_pty.c,v 1.5 2003/07/19 21:14:39 dillon Exp $
  */
 
 /*
@@ -214,8 +214,7 @@ ptsopen(dev_t dev, int flag, int devtype, struct thread *td)
 	while ((tp->t_state & TS_CARR_ON) == 0) {
 		if (flag&FNONBLOCK)
 			break;
-		error = ttysleep(tp, TSA_CARR_ON(tp), TTIPRI | PCATCH,
-				 "ptsopn", 0);
+		error = ttysleep(tp, TSA_CARR_ON(tp), PCATCH, "ptsopn", 0);
 		if (error)
 			return (error);
 	}
@@ -260,15 +259,14 @@ again:
 			    p->p_pgrp->pg_jobc == 0 || p->p_flag & P_PPWAIT)
 				return (EIO);
 			pgsignal(p->p_pgrp, SIGTTIN, 1);
-			error = ttysleep(tp, &lbolt, TTIPRI | PCATCH, "ptsbg",
-					 0);
+			error = ttysleep(tp, &lbolt, PCATCH, "ptsbg", 0);
 			if (error)
 				return (error);
 		}
 		if (tp->t_canq.c_cc == 0) {
 			if (flag & IO_NDELAY)
 				return (EWOULDBLOCK);
-			error = ttysleep(tp, TSA_PTS_READ(tp), TTIPRI | PCATCH,
+			error = ttysleep(tp, TSA_PTS_READ(tp), PCATCH,
 					 "ptsin", 0);
 			if (error)
 				return (error);
@@ -450,7 +448,7 @@ ptcread(dev, uio, flag)
 			return (0);	/* EOF */
 		if (flag & IO_NDELAY)
 			return (EWOULDBLOCK);
-		error = tsleep(TSA_PTC_READ(tp), TTIPRI | PCATCH, "ptcin", 0);
+		error = tsleep(TSA_PTC_READ(tp), PCATCH, "ptcin", 0);
 		if (error)
 			return (error);
 	}
@@ -641,7 +639,7 @@ block:
 			return (EWOULDBLOCK);
 		return (0);
 	}
-	error = tsleep(TSA_PTC_WRITE(tp), TTOPRI | PCATCH, "ptcout", 0);
+	error = tsleep(TSA_PTC_WRITE(tp), PCATCH, "ptcout", 0);
 	if (error) {
 		/* adjust for data copied in but not written */
 		uio->uio_resid += cc;
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 1b726e5024..ff18246422 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -32,7 +32,7 @@
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.51.2.24 2003/04/15 06:59:29 silby Exp $
- * $DragonFly: src/sys/kern/uipc_mbuf.c,v 1.6 2003/07/19 21:09:24 dillon Exp $
+ * $DragonFly: src/sys/kern/uipc_mbuf.c,v 1.7 2003/07/19 21:14:39 dillon Exp $
  */
 
 #include "opt_param.h"
@@ -253,7 +253,7 @@ m_mballoc_wait(int caller, int type)
 
 	s = splimp();
 	m_mballoc_wid++;
-	if ((tsleep(&m_mballoc_wid, PVM, "mballc", mbuf_wait)) == EWOULDBLOCK)
+	if ((tsleep(&m_mballoc_wid, 0, "mballc", mbuf_wait)) == EWOULDBLOCK)
 		m_mballoc_wid--;
 	splx(s);
 
@@ -296,7 +296,7 @@ kproc_mclalloc(void)
 	int status;
 
 	while (1) {
-		tsleep(&i_want_my_mcl, PVM, "mclalloc", 0);
+		tsleep(&i_want_my_mcl, 0, "mclalloc", 0);
 
 		for (; i_want_my_mcl; i_want_my_mcl--) {
 			if (m_clalloc(1, M_WAIT) == 0)
@@ -407,7 +407,7 @@ m_clalloc_wait(void)
 
 	/* Sleep until something's available or until we expire. */
 	m_clalloc_wid++;
-	if ((tsleep(&m_clalloc_wid, PVM, "mclalc", mbuf_wait)) == EWOULDBLOCK)
+	if ((tsleep(&m_clalloc_wid, 0, "mclalc", mbuf_wait)) == EWOULDBLOCK)
 		m_clalloc_wid--;
 
 	/*
@@ -468,6 +468,7 @@ m_retry(i, t)
 		mbstat.m_wait++;
 	} else {
 		static int last_report ; /* when we did that (in ticks) */
+
 		splx(ms);
 		mbstat.m_drops++;
 		if (ticks < last_report || (ticks - last_report) >= hz) {
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 2e58df83b5..a2746d821c 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -32,7 +32,7 @@
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
  * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.68.2.22 2002/12/15 09:24:23 maxim Exp $
- * $DragonFly: src/sys/kern/uipc_socket.c,v 1.6 2003/07/06 21:23:51 dillon Exp $
+ * $DragonFly: src/sys/kern/uipc_socket.c,v 1.7 2003/07/19 21:14:39 dillon Exp $
  */
 
 #include "opt_inet.h"
@@ -297,7 +297,7 @@ soclose(struct socket *so)
 				goto drop;
 			while (so->so_state & SS_ISCONNECTED) {
 				error = tsleep((caddr_t)&so->so_timeo,
-				    PSOCK | PCATCH, "soclos", so->so_linger * hz);
+				    PCATCH, "soclos", so->so_linger * hz);
 				if (error)
 					break;
 			}
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 85e16a28a3..f440025d38 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -32,7 +32,7 @@
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.55.2.17 2002/08/31 19:04:55 dwmalone Exp $
- * $DragonFly: src/sys/kern/uipc_socket2.c,v 1.3 2003/06/25 03:55:57 dillon Exp $
+ * $DragonFly: src/sys/kern/uipc_socket2.c,v 1.4 2003/07/19 21:14:39 dillon Exp $
  */
 
 #include "opt_param.h"
@@ -256,8 +256,9 @@ sbwait(sb)
 
 	sb->sb_flags |= SB_WAIT;
 	return (tsleep((caddr_t)&sb->sb_cc,
-	    (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, "sbwait",
-	    sb->sb_timeo));
+			((sb->sb_flags & SB_NOINTR) ? 0 : PCATCH),
+			"sbwait",
+			sb->sb_timeo));
 }
 
 /*
@@ -273,8 +274,8 @@ sb_lock(sb)
 	while (sb->sb_flags & SB_LOCK) {
 		sb->sb_flags |= SB_WANT;
 		error = tsleep((caddr_t)&sb->sb_flags,
-		    (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK|PCATCH,
-		    "sblock", 0);
+			    ((sb->sb_flags & SB_NOINTR) ? 0 : PCATCH),
+			    "sblock", 0);
 		if (error)
 			return (error);
 	}
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index af9a74e188..fd938fa4bd 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -35,7 +35,7 @@
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
  * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.65.2.17 2003/04/04 17:11:16 tegge Exp $
- * $DragonFly: src/sys/kern/uipc_syscalls.c,v 1.4 2003/06/25 03:55:57 dillon Exp $
+ * $DragonFly: src/sys/kern/uipc_syscalls.c,v 1.5 2003/07/19 21:14:39 dillon Exp $
  */
 
 #include "opt_compat.h"
@@ -230,8 +230,7 @@ accept1(struct accept_args *uap, int compat)
 			head->so_error = EWOULDBLOCK;
 			break;
 		}
-		error = tsleep((caddr_t)&head->so_timeo, PSOCK | PCATCH,
-		    "accept", 0);
+		error = tsleep((caddr_t)&head->so_timeo, PCATCH, "accept", 0);
 		if (error) {
 			splx(s);
 			goto done;
@@ -403,8 +402,7 @@ connect(struct connect_args *uap)
 	}
 	s = splnet();
 	while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-		error = tsleep((caddr_t)&so->so_timeo, PSOCK | PCATCH,
-		    "connec", 0);
+		error = tsleep((caddr_t)&so->so_timeo, PCATCH, "connec", 0);
 		if (error)
 			break;
 	}
@@ -1392,7 +1390,7 @@ sf_buf_alloc()
 	s = splimp();
 	while ((sf = SLIST_FIRST(&sf_freelist)) == NULL) {
 		sf_buf_alloc_want = 1;
-		error = tsleep(&sf_freelist, PVM|PCATCH, "sfbufa", 0);
+		error = tsleep(&sf_freelist, PCATCH, "sfbufa", 0);
 		if (error)
 			break;
 	}
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index d00b7bf364..6f3ec150ee 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -14,7 +14,7 @@
  * of the author.  This software is distributed AS-IS.
  *
  * $FreeBSD: src/sys/kern/vfs_aio.c,v 1.70.2.28 2003/05/29 06:15:35 alc Exp $
- * $DragonFly: src/sys/kern/vfs_aio.c,v 1.6 2003/07/06 21:23:51 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_aio.c,v 1.7 2003/07/19 21:14:39 dillon Exp $
  */
 
 /*
@@ -315,7 +315,7 @@ aio_free_entry(struct aiocblist *aiocbe)
 
 	while (aiocbe->jobstate == JOBST_JOBRUNNING) {
 		aiocbe->jobflags |= AIOCBLIST_RUNDOWN;
-		tsleep(aiocbe, PRIBIO, "jobwai", 0);
+		tsleep(aiocbe, 0, "jobwai", 0);
 	}
 	if (aiocbe->bp == NULL) {
 		if (ki->kaio_queue_count <= 0)
@@ -414,7 +414,7 @@ aio_proc_rundown(struct proc *p)
 	while ((ki->kaio_active_count > 0) || (ki->kaio_buffer_count >
 	    ki->kaio_buffer_finished_count)) {
 		ki->kaio_flags |= KAIO_RUNDOWN;
-		if (tsleep(p, PRIBIO, "kaiowt", aiod_timeout))
+		if (tsleep(p, 0, "kaiowt", aiod_timeout))
 			break;
 	}
 
@@ -464,7 +464,7 @@ restart3:
 	s = splbio();
 	while (TAILQ_FIRST(&ki->kaio_bufqueue)) {
 		ki->kaio_flags |= KAIO_WAKEUP;
-		tsleep(p, PRIBIO, "aioprn", 0);
+		tsleep(p, 0, "aioprn", 0);
 		splx(s);
 		goto restart3;
 	}
@@ -845,7 +845,7 @@ aio_daemon(void *uproc)
 		 * thereby freeing resources.
 		 */
 		if (((aiop->aioprocflags & AIOP_SCHED) == 0) && tsleep(mycp,
-		    PRIBIO, "aiordy", aiod_lifetime)) {
+		    0, "aiordy", aiod_lifetime)) {
 			s = splnet();
 			if (TAILQ_EMPTY(&aio_jobs)) {
 				if ((aiop->aioprocflags & AIOP_FREE) &&
@@ -890,7 +890,7 @@ aio_newproc()
 	 * Wait until daemon is started, but continue on just in case to
 	 * handle error conditions.
 	 */
-	error = tsleep(np, PZERO, "aiosta", aiod_timeout);
+	error = tsleep(np, 0, "aiosta", aiod_timeout);
 	num_aio_procs++;
 
 	return error;
@@ -1053,7 +1053,7 @@ aio_fphysio(struct aiocblist *iocb)
 
 	s = splbio();
 	while ((bp->b_flags & B_DONE) == 0) {
-		if (tsleep(bp, PRIBIO, "physstr", aiod_timeout)) {
+		if (tsleep(bp, 0, "physstr", aiod_timeout)) {
 			if ((bp->b_flags & B_DONE) == 0) {
 				splx(s);
 				return EINPROGRESS;
@@ -1562,7 +1562,7 @@ aio_suspend(struct aio_suspend_args *uap)
 		}
 
 		ki->kaio_flags |= KAIO_WAKEUP;
-		error = tsleep(p, PRIBIO | PCATCH, "aiospn", timo);
+		error = tsleep(p, PCATCH, "aiospn", timo);
 		splx(s);
 
 		if (error == ERESTART || error == EINTR) {
@@ -1972,7 +1972,7 @@ lio_listio(struct lio_listio_args *uap)
 				return runningcode;
 			
 			ki->kaio_flags |= KAIO_WAKEUP;
-			error = tsleep(p, PRIBIO | PCATCH, "aiospn", 0);
+			error = tsleep(p, PCATCH, "aiospn", 0);
 
 			if (error == EINTR)
 				return EINTR;
@@ -2140,7 +2140,7 @@ aio_waitcomplete(struct aio_waitcomplete_args *uap)
 		}
 
 		ki->kaio_flags |= KAIO_WAKEUP;
-		error = tsleep(p, PRIBIO | PCATCH, "aiowc", timo);
+		error = tsleep(p, PCATCH, "aiowc", timo);
 		splx(s);
 
 		if (error == ERESTART)
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 7ed1d9b99a..22ecab126e 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -12,7 +12,7 @@
  *		John S. Dyson.
  *
  * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.242.2.20 2003/05/28 18:38:10 alc Exp $
- * $DragonFly: src/sys/kern/vfs_bio.c,v 1.9 2003/07/06 21:23:51 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_bio.c,v 1.10 2003/07/19 21:14:39 dillon Exp $
  */
 
 /*
@@ -269,7 +269,7 @@ waitrunningbufspace(void)
 
 		s = splbio();	/* fix race against interrupt/biodone() */
 		++runningbufreq;
-		tsleep(&runningbufreq, PVM, "wdrain", 0);
+		tsleep(&runningbufreq, 0, "wdrain", 0);
 		splx(s);
 	}
 }
@@ -609,7 +609,7 @@ bwrite(struct buf * bp)
 			return (0);
 		}
 		bp->b_xflags |= BX_BKGRDWAIT;
-		tsleep(&bp->b_xflags, PRIBIO, "biord", 0);
+		tsleep(&bp->b_xflags, 0, "biord", 0);
 		if (bp->b_xflags & BX_BKGRDINPROG)
 			panic("bwrite: still writing");
 	}
@@ -936,7 +936,7 @@ bwillwrite(void)
 		while (numdirtybuffers >= hidirtybuffers) {
 			bd_wakeup(1);
 			needsbuffer |= VFS_BIO_NEED_DIRTYFLUSH;
-			tsleep(&needsbuffer, (PRIBIO + 4), "flswai", 0);
+			tsleep(&needsbuffer, 0, "flswai", 0);
 		}
 		splx(s);
 	}
@@ -1693,8 +1693,7 @@ restart:
 
 		needsbuffer |= flags;
 		while (needsbuffer & flags) {
-			if (tsleep(&needsbuffer, (PRIBIO + 4) | slpflag,
-			    waitmsg, slptimeo))
+			if (tsleep(&needsbuffer, slpflag, waitmsg, slptimeo))
 				return (NULL);
 		}
 	} else {
@@ -1809,14 +1808,14 @@ buf_daemon()
 			 * The sleep is just so the suspend code works.
 			 */
 			bd_request = 0;
-			tsleep(&bd_request, PVM, "psleep", hz);
+			tsleep(&bd_request, 0, "psleep", hz);
 		} else {
 			/*
 			 * We couldn't find any flushable dirty buffers but
 			 * still have too many dirty buffers, we
 			 * have to sleep and try again.  (rare)
 			 */
-			tsleep(&bd_request, PVM, "qsleep", hz / 2);
+			tsleep(&bd_request, 0, "qsleep", hz / 2);
 		}
 	}
 }
@@ -2079,8 +2078,7 @@ loop:
 		if (!curproc)
 			return NULL;
 		needsbuffer |= VFS_BIO_NEED_ANY;
-		tsleep(&needsbuffer, (PRIBIO + 4) | slpflag, "newbuf",
-		    slptimeo);
+		tsleep(&needsbuffer, slpflag, "newbuf", slptimeo);
 	}
 
 	if ((bp = gbincore(vp, blkno))) {
@@ -2605,12 +2603,12 @@ biowait(register struct buf * bp)
 	s = splbio();
 	while ((bp->b_flags & B_DONE) == 0) {
 #if defined(NO_SCHEDULE_MODS)
-		tsleep(bp, PRIBIO, "biowait", 0);
+		tsleep(bp, 0, "biowait", 0);
 #else
 		if (bp->b_flags & B_READ)
-			tsleep(bp, PRIBIO, "biord", 0);
+			tsleep(bp, 0, "biord", 0);
 		else
-			tsleep(bp, PRIBIO, "biowr", 0);
+			tsleep(bp, 0, "biowr", 0);
 #endif
 	}
 	splx(s);
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 0d5879827b..79effea3c1 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -37,7 +37,7 @@
  *
  *
  * $FreeBSD: src/sys/kern/vfs_default.c,v 1.28.2.7 2003/01/10 18:23:26 bde Exp $
- * $DragonFly: src/sys/kern/vfs_default.c,v 1.5 2003/07/06 21:23:51 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_default.c,v 1.6 2003/07/19 21:14:39 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -548,7 +548,7 @@ retry:
 	} else {
 		if (object->flags & OBJ_DEAD) {
 			VOP_UNLOCK(vp, 0, td);
-			tsleep(object, PVM, "vodead", 0);
+			tsleep(object, 0, "vodead", 0);
 			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 			goto retry;
 		}
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 46e23a0627..223c7fb594 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -37,7 +37,7 @@
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
  * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.249.2.30 2003/04/04 20:35:57 tegge Exp $
- * $DragonFly: src/sys/kern/vfs_subr.c,v 1.11 2003/07/08 17:21:53 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_subr.c,v 1.12 2003/07/19 21:14:39 dillon Exp $
  */
 
 /*
@@ -217,7 +217,7 @@ vfs_busy(struct mount *mp, int flags, struct lwkt_token *interlkp,
 		 * wakeup needs to be done is at the release of the
 		 * exclusive lock at the end of dounmount.
 		 */
-		tsleep((caddr_t)mp, PVFS, "vfs_busy", 0);
+		tsleep((caddr_t)mp, 0, "vfs_busy", 0);
 		if (interlkp) {
 			lwkt_gettoken(interlkp);
 		}
@@ -262,7 +262,7 @@ vfs_rootmountalloc(char *fstypename, char *devname, struct mount **mpp)
 		return (ENODEV);
 	mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
 	bzero((char *)mp, (u_long)sizeof(struct mount));
-	lockinit(&mp->mnt_lock, PVFS, "vfslock", VLKTIMEOUT, LK_NOPAUSE);
+	lockinit(&mp->mnt_lock, 0, "vfslock", VLKTIMEOUT, LK_NOPAUSE);
 	(void)vfs_busy(mp, LK_NOWAIT, 0, td);
 	TAILQ_INIT(&mp->mnt_nvnodelist);
 	TAILQ_INIT(&mp->mnt_reservedvnlist);
@@ -531,7 +531,7 @@ vnlru_proc(void)
 		if (numvnodes - freevnodes <= desiredvnodes * 9 / 10) {
 			vnlruproc_sig = 0;
 			wakeup(&vnlruproc_sig);
-			tsleep(td, PVFS, "vlruwt", hz);
+			tsleep(td, 0, "vlruwt", hz);
 			continue;
 		}
 		done = 0;
@@ -549,7 +549,7 @@ vnlru_proc(void)
 		lwkt_reltoken(&mountlist_token);
 		if (done == 0) {
 			vnlru_nowhere++;
-			tsleep(td, PPAUSE, "vlrup", hz * 3);
+			tsleep(td, 0, "vlrup", hz * 3);
 		}
 	}
 	splx(s);
@@ -597,7 +597,7 @@ getnewvnode(tag, mp, vops, vpp)
 			vnlruproc_sig = 1;	/* avoid unnecessary wakeups */
 			wakeup(vnlruthread);
 		}
-		tsleep(&vnlruproc_sig, PVFS, "vlruwk", hz);
+		tsleep(&vnlruproc_sig, 0, "vlruwk", hz);
 	}
 
 
@@ -834,7 +834,7 @@ vinvalbuf(struct vnode *vp, int flags, struct thread *td,
 		while (vp->v_numoutput) {
 			vp->v_flag |= VBWAIT;
 			error = tsleep((caddr_t)&vp->v_numoutput,
-			    slpflag | (PRIBIO + 1), "vinvlbuf", slptimeo);
+			    slpflag, "vinvlbuf", slptimeo);
 			if (error) {
 				splx(s);
 				return (error);
@@ -911,7 +911,7 @@ vinvalbuf(struct vnode *vp, int flags, struct thread *td,
 	do {
 		while (vp->v_numoutput > 0) {
 			vp->v_flag |= VBWAIT;
-			tsleep(&vp->v_numoutput, PVM, "vnvlbv", 0);
+			tsleep(&vp->v_numoutput, 0, "vnvlbv", 0);
 		}
 		if (VOP_GETVOBJECT(vp, &object) == 0) {
 			while (object->paging_in_progress)
@@ -1029,7 +1029,7 @@ restartsync:
 
 	while (vp->v_numoutput > 0) {
 		vp->v_flag |= VBWAIT;
-		tsleep(&vp->v_numoutput, PVM, "vbtrunc", 0);
+		tsleep(&vp->v_numoutput, 0, "vbtrunc", 0);
 	}
 
 	splx(s);
@@ -1245,7 +1245,7 @@ sched_sync(void)
 		 * filesystem activity.
 		 */
 		if (time_second == starttime)
-			tsleep(&lbolt, PPAUSE, "syncer", 0);
+			tsleep(&lbolt, 0, "syncer", 0);
 	}
 }
 
@@ -1562,7 +1562,7 @@ vget(vp, flags, td)
 		} else {
 			vp->v_flag |= VXWANT;
 			lwkt_reltoken(&vp->v_interlock);
-			tsleep((caddr_t)vp, PINOD, "vget", 0);
+			tsleep((caddr_t)vp, 0, "vget", 0);
 			return (ENOENT);
 		}
 	}
@@ -2001,7 +2001,7 @@ vop_revoke(ap)
 	if (vp->v_flag & VXLOCK) {
 		vp->v_flag |= VXWANT;
 		lwkt_reltoken(&vp->v_interlock);
-		tsleep((caddr_t)vp, PINOD, "vop_revokeall", 0);
+		tsleep((caddr_t)vp, 0, "vop_revokeall", 0);
 		return (0);
 	}
 	dev = vp->v_rdev;
@@ -2063,7 +2063,7 @@ vgonel(struct vnode *vp, struct thread *td)
 	if (vp->v_flag & VXLOCK) {
 		vp->v_flag |= VXWANT;
 		lwkt_reltoken(&vp->v_interlock);
-		tsleep((caddr_t)vp, PINOD, "vgone", 0);
+		tsleep((caddr_t)vp, 0, "vgone", 0);
 		return;
 	}
 
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 4597066500..706e009fba 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -37,7 +37,7 @@
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
  * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.151.2.18 2003/04/04 20:35:58 tegge Exp $
- * $DragonFly: src/sys/kern/vfs_syscalls.c,v 1.8 2003/07/06 21:23:51 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_syscalls.c,v 1.9 2003/07/19 21:14:39 dillon Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
@@ -279,7 +279,7 @@ mount(struct mount_args *uap)
 	TAILQ_INIT(&mp->mnt_nvnodelist);
 	TAILQ_INIT(&mp->mnt_reservedvnlist);
 	mp->mnt_nvnodelistsize = 0;
-	lockinit(&mp->mnt_lock, PVFS, "vfslock", 0, LK_NOPAUSE);
+	lockinit(&mp->mnt_lock, 0, "vfslock", 0, LK_NOPAUSE);
 	(void)vfs_busy(mp, LK_NOWAIT, 0, td);
 	mp->mnt_op = vfsp->vfc_vfsops;
 	mp->mnt_vfc = vfsp;
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 4aab82bba8..0c40b84ba1 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -37,7 +37,7 @@
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.87.2.13 2002/12/29 18:19:53 dillon Exp $
- * $DragonFly: src/sys/kern/vfs_vnops.c,v 1.7 2003/07/06 21:23:51 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_vnops.c,v 1.8 2003/07/19 21:14:39 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -638,7 +638,7 @@ debug_vn_lock(struct vnode *vp, int flags, struct thread *td,
 		if ((vp->v_flag & VXLOCK) && vp->v_vxproc != curproc) {
 			vp->v_flag |= VXWANT;
 			lwkt_reltoken(&vp->v_interlock);
-			tsleep((caddr_t)vp, PINOD, "vn_lock", 0);
+			tsleep((caddr_t)vp, 0, "vn_lock", 0);
 			error = ENOENT;
 		} else {
 #if 0
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 447e5d996d..d1106ae8f8 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -38,7 +38,7 @@
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
  * $FreeBSD: src/sys/net/bpf.c,v 1.59.2.12 2002/04/14 21:41:48 luigi Exp $
- * $DragonFly: src/sys/net/bpf.c,v 1.3 2003/06/23 17:55:45 dillon Exp $
+ * $DragonFly: src/sys/net/bpf.c,v 1.4 2003/07/19 21:14:43 dillon Exp $
  */
 
 #include "bpf.h"
@@ -505,8 +505,7 @@ bpfread(dev, uio, ioflag)
 			splx(s);
 			return (EWOULDBLOCK);
 		}
-		error = BPF_SLEEP((caddr_t)d, PRINET|PCATCH, "bpf",
-				  d->bd_rtout);
+		error = BPF_SLEEP((caddr_t)d, PCATCH, "bpf", d->bd_rtout);
 		if (error == EINTR || error == ERESTART) {
 			splx(s);
 			return (error);
diff --git a/sys/net/i4b/driver/i4b_rbch.c b/sys/net/i4b/driver/i4b_rbch.c
index 25c5403b3b..f65f85a58a 100644
--- a/sys/net/i4b/driver/i4b_rbch.c
+++ b/sys/net/i4b/driver/i4b_rbch.c
@@ -28,7 +28,7 @@
  *	---------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.10.2.3 2001/08/12 16:22:48 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_rbch.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_rbch.c,v 1.3 2003/07/19 21:14:36 dillon Exp $
  *
  *	last edit-date: [Sat Aug 11 18:06:57 2001]
  *
@@ -395,8 +395,7 @@ i4brbchread(dev_t dev, struct uio *uio, int ioflag)
 			NDBGL4(L4_RBCHDBG, "unit %d, wait read init", unit);
 		
 			if((error = tsleep((caddr_t) &rbch_softc[unit],
-					   TTIPRI | PCATCH,
-					   "rrrbch", 0 )) != 0)
+					       PCATCH, "rrrbch", 0 )) != 0)
 			{
 				CRIT_END;
 				NDBGL4(L4_RBCHDBG, "unit %d, error %d tsleep", unit, error);
@@ -416,8 +415,7 @@ i4brbchread(dev_t dev, struct uio *uio, int ioflag)
 			NDBGL4(L4_RBCHDBG, "unit %d, wait read data", unit);
 		
 			if((error = tsleep((caddr_t) &isdn_linktab[unit]->rx_queue,
-					   TTIPRI | PCATCH,
-					   "rrbch", 0 )) != 0)
+					   PCATCH, "rrbch", 0 )) != 0)
 			{
 				CRIT_END;
 				NDBGL4(L4_RBCHDBG, "unit %d, error %d tsleep read", unit, error);
@@ -490,8 +488,7 @@ i4brbchwrite(dev_t dev, struct uio * uio, int ioflag)
 			NDBGL4(L4_RBCHDBG, "unit %d, write wait init", unit);
 		
 			error = tsleep((caddr_t) &rbch_softc[unit],
-						   TTIPRI | PCATCH,
-						   "wrrbch", 0 );
+						   PCATCH, "wrrbch", 0 );
 			if(error == ERESTART) {
 				CRIT_END;
 				return (ERESTART);
@@ -508,7 +505,7 @@ i4brbchwrite(dev_t dev, struct uio * uio, int ioflag)
 				NDBGL4(L4_RBCHDBG, "unit %d, error %d tsleep init", unit, error);
 				return(error);
 			}
-			tsleep((caddr_t) &rbch_softc[unit], TTIPRI | PCATCH, "xrbch", (hz*1));
+			tsleep((caddr_t) &rbch_softc[unit], PCATCH, "xrbch", (hz*1));
 		}
 
 		while(_IF_QFULL(isdn_linktab[unit]->tx_queue) && (sc->sc_devstate & ST_ISOPEN))
@@ -518,8 +515,7 @@ i4brbchwrite(dev_t dev, struct uio * uio, int ioflag)
 			NDBGL4(L4_RBCHDBG, "unit %d, write queue full", unit);
 		
 			if ((error = tsleep((caddr_t) &isdn_linktab[unit]->tx_queue,
-					    TTIPRI | PCATCH,
-					    "wrbch", 0)) != 0) {
+					    PCATCH, "wrbch", 0)) != 0) {
 				sc->sc_devstate &= ~ST_WRWAITEMPTY;
 				if(error == ERESTART)
 				{
diff --git a/sys/net/i4b/driver/i4b_tel.c b/sys/net/i4b/driver/i4b_tel.c
index e3bbbde104..f8835c4347 100644
--- a/sys/net/i4b/driver/i4b_tel.c
+++ b/sys/net/i4b/driver/i4b_tel.c
@@ -28,7 +28,7 @@
  *	--------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_tel.c,v 1.10.2.4 2001/12/16 15:12:57 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_tel.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_tel.c,v 1.3 2003/07/19 21:14:36 dillon Exp $
  *
  *	last edit-date: [Sat Aug 11 18:07:05 2001]
  *
@@ -287,7 +287,7 @@ i4btelclose(dev_t dev, int flag, int fmt, struct proc *p)
 			sc->devstate |= ST_WRWAITEMPTY;
 	
 			if((error = tsleep((caddr_t) &sc->isdn_linktab->tx_queue,
-					TTIPRI | PCATCH, "wtcl", 0)) != 0)
+					PCATCH, "wtcl", 0)) != 0)
 			{
 				break;
 			}
@@ -384,7 +384,7 @@ i4btelioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 				while ((sc->devstate & ST_TONE) && 
 				    sc->tones.duration[sc->toneidx] != 0) {
 					if((error = tsleep((caddr_t) &sc->tones,
-					    TTIPRI | PCATCH, "rtone", 0 )) != 0) {
+					    PCATCH, "rtone", 0 )) != 0) {
 					    	splx(s);
 						return(error);
 					}
@@ -462,8 +462,7 @@ i4btelread(dev_t dev, struct uio *uio, int ioflag)
 					"rtel", 0 )) != 0)
 #else
 			if((error = tsleep((caddr_t) &sc->isdn_linktab->rx_queue,
-						TTIPRI | PCATCH,
-						"rtel", 0 )) != 0)
+						PCATCH, "rtel", 0 )) != 0)
 #endif						
 			{
 				sc->devstate &= ~ST_RDWAITDATA;
@@ -527,8 +526,7 @@ i4btelread(dev_t dev, struct uio *uio, int ioflag)
 			sc->devstate |= ST_RDWAITDATA;
 	
 			if((error = tsleep((caddr_t) &sc->result,
-						TTIPRI | PCATCH,
-						"rtel1", 0 )) != 0)
+						PCATCH, "rtel1", 0 )) != 0)
 			{
 				sc->devstate &= ~ST_RDWAITDATA;
 				splx(s);
@@ -597,7 +595,7 @@ i4btelwrite(dev_t dev, struct uio * uio, int ioflag)
 					TTIPRI | PCATCH, "wtel", 0)) != 0)
 #else
 			if((error = tsleep((caddr_t) &sc->isdn_linktab->tx_queue,
-					TTIPRI | PCATCH, "wtel", 0)) != 0)
+					PCATCH, "wtel", 0)) != 0)
 #endif					
 			{
 				sc->devstate &= ~ST_WRWAITEMPTY;
diff --git a/sys/net/i4b/driver/i4b_trace.c b/sys/net/i4b/driver/i4b_trace.c
index 4361381c0b..c43c45a9ce 100644
--- a/sys/net/i4b/driver/i4b_trace.c
+++ b/sys/net/i4b/driver/i4b_trace.c
@@ -30,7 +30,7 @@
  *	last edit-date: [Sat Aug 11 18:07:15 2001]
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_trace.c,v 1.9.2.3 2001/08/12 16:22:48 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_trace.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_trace.c,v 1.3 2003/07/19 21:14:37 dillon Exp $
  *
  *	NOTE: the code assumes that SPLI4B >= splimp !
  *
@@ -432,8 +432,7 @@ i4btrcread(dev_t dev, struct uio * uio, int ioflag)
 					"bitrc", 0 )) != 0)
 #else
 		if((error = tsleep((caddr_t) &trace_queue[unit],
-					TTIPRI | PCATCH,
-					"bitrc", 0 )) != 0)
+					PCATCH, "bitrc", 0 )) != 0)
 #endif                                                                                               
 		{
 			device_state[unit] &= ~ST_WAITDATA;
diff --git a/sys/net/i4b/layer4/i4b_i4bdrv.c b/sys/net/i4b/layer4/i4b_i4bdrv.c
index 4dc4ef159b..89fa26e8c7 100644
--- a/sys/net/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/net/i4b/layer4/i4b_i4bdrv.c
@@ -28,7 +28,7 @@
  *	--------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer4/i4b_i4bdrv.c,v 1.11.2.5 2001/12/16 15:12:59 hm Exp $
- * $DragonFly: src/sys/net/i4b/layer4/i4b_i4bdrv.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer4/i4b_i4bdrv.c,v 1.3 2003/07/19 21:14:37 dillon Exp $
  *
  *      last edit-date: [Sat Aug 11 18:08:10 2001]
  *
@@ -329,10 +329,9 @@ i4bread(dev_t dev, struct uio *uio, int ioflag)
 		readflag = 1;
 #if defined (__FreeBSD__) && __FreeBSD__ > 4		
 		error = msleep((caddr_t) &i4b_rdqueue, &i4b_rdqueue.ifq_mtx,
-			(PZERO + 1) | PCATCH, "bird", 0);
+			PCATCH, "bird", 0);
 #else
-		error = tsleep((caddr_t) &i4b_rdqueue, (PZERO + 1) | PCATCH,
-			"bird", 0);
+		error = tsleep((caddr_t) &i4b_rdqueue, PCATCH, "bird", 0);
 #endif
 		if (error != 0) {
 			IF_UNLOCK(&i4b_rdqueue);
diff --git a/sys/net/ppp_layer/ppp_tty.c b/sys/net/ppp_layer/ppp_tty.c
index 40b45d40d2..a919c707fc 100644
--- a/sys/net/ppp_layer/ppp_tty.c
+++ b/sys/net/ppp_layer/ppp_tty.c
@@ -71,7 +71,7 @@
  */
 
 /* $FreeBSD: src/sys/net/ppp_tty.c,v 1.43.2.1 2002/02/13 00:43:11 dillon Exp $ */
-/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.4 2003/06/25 03:56:02 dillon Exp $ */
+/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.5 2003/07/19 21:14:43 dillon Exp $ */
 
 #include "opt_ppp.h"		/* XXX for ppp_defs.h */
 
@@ -366,7 +366,7 @@ pppread(tp, uio, flag)
 	    splx(s);
 	    return (EWOULDBLOCK);
 	}
-	error = ttysleep(tp, TSA_HUP_OR_INPUT(tp), TTIPRI | PCATCH, "pppin", 0);
+	error = ttysleep(tp, TSA_HUP_OR_INPUT(tp), PCATCH, "pppin", 0);
 	if (error) {
 	    splx(s);
 	    return error;
diff --git a/sys/net/tap/if_tap.c b/sys/net/tap/if_tap.c
index adef9a1089..66bc6b7bc4 100644
--- a/sys/net/tap/if_tap.c
+++ b/sys/net/tap/if_tap.c
@@ -32,7 +32,7 @@
 
 /*
  * $FreeBSD: src/sys/net/if_tap.c,v 1.3.2.3 2002/04/14 21:41:48 luigi Exp $
- * $DragonFly: src/sys/net/tap/if_tap.c,v 1.4 2003/06/25 03:56:02 dillon Exp $
+ * $DragonFly: src/sys/net/tap/if_tap.c,v 1.5 2003/07/19 21:14:43 dillon Exp $
  * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $
  */
 
@@ -667,7 +667,7 @@ tapread(dev, uio, flag)
 				return (EWOULDBLOCK);
 			
 			tp->tap_flags |= TAP_RWAIT;
-			error = tsleep((caddr_t)tp,PCATCH|(PZERO+1),"taprd",0);
+			error = tsleep((caddr_t)tp, PCATCH, "taprd", 0);
 			if (error)
 				return (error);
 		}
diff --git a/sys/net/tun/if_tun.c b/sys/net/tun/if_tun.c
index d99c06d545..5c8e20bb68 100644
--- a/sys/net/tun/if_tun.c
+++ b/sys/net/tun/if_tun.c
@@ -14,7 +14,7 @@
  * operation though.
  *
  * $FreeBSD: src/sys/net/if_tun.c,v 1.74.2.8 2002/02/13 00:43:11 dillon Exp $
- * $DragonFly: src/sys/net/tun/if_tun.c,v 1.4 2003/06/25 03:56:02 dillon Exp $
+ * $DragonFly: src/sys/net/tun/if_tun.c,v 1.5 2003/07/19 21:14:43 dillon Exp $
  */
 
 #include "opt_inet.h"
@@ -548,7 +548,7 @@ tunread(dev, uio, flag)
 				return EWOULDBLOCK;
 			}
 			tp->tun_flags |= TUN_RWAIT;
-			if((error = tsleep((caddr_t)tp, PCATCH | (PZERO + 1),
+			if((error = tsleep((caddr_t)tp, PCATCH,
 					"tunread", 0)) != 0) {
 				splx(s);
 				return error;
diff --git a/sys/netgraph/netgraph/ng_base.c b/sys/netgraph/netgraph/ng_base.c
index 766603a119..5f4f16e933 100644
--- a/sys/netgraph/netgraph/ng_base.c
+++ b/sys/netgraph/netgraph/ng_base.c
@@ -38,7 +38,7 @@
  *          Archie Cobbs <archie@freebsd.org>
  *
  * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.11.2.17 2002/07/02 23:44:02 archie Exp $
- * $DragonFly: src/sys/netgraph/netgraph/ng_base.c,v 1.2 2003/06/17 04:28:49 dillon Exp $
+ * $DragonFly: src/sys/netgraph/netgraph/ng_base.c,v 1.3 2003/07/19 21:14:44 dillon Exp $
  * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
  */
 
@@ -469,7 +469,7 @@ ng_wait_node(node_p node, char *msg)
 	node->sleepers++;
 	node->refs++;		/* the sleeping process counts as a reference */
 	while ((node->flags & (NG_BUSY | NG_INVALID)) == NG_BUSY)
-		error = tsleep(node, (PZERO + 1) | PCATCH, msg, 0);
+		error = tsleep(node, PCATCH, msg, 0);
 	node->sleepers--;
 	if (node->flags & NG_INVALID) {
 		TRAP_ERROR;
diff --git a/sys/netproto/atalk/at_control.c b/sys/netproto/atalk/at_control.c
index 2e1389bdee..dae2cb90ce 100644
--- a/sys/netproto/atalk/at_control.c
+++ b/sys/netproto/atalk/at_control.c
@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
+ *
+ * $DragonFly: src/sys/netproto/atalk/at_control.c,v 1.3 2003/07/19 21:14:44 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -520,7 +522,7 @@ at_ifinit( ifp, aa, sat )
 		 * though why wait 200mSec?
 		 */
 		aa->aa_ch = timeout( aarpprobe, (caddr_t)ifp, hz / 5 );
-		if ( tsleep( aa, PPAUSE|PCATCH, "at_ifinit", 0 )) {
+		if ( tsleep( aa, PCATCH, "at_ifinit", 0 )) {
 		    /*
 		     * theoretically we shouldn't time out here
 		     * so if we returned with an error..
diff --git a/sys/netproto/ncp/ncp_conn.c b/sys/netproto/ncp/ncp_conn.c
index 63931d1212..3ce8e46196 100644
--- a/sys/netproto/ncp/ncp_conn.c
+++ b/sys/netproto/ncp/ncp_conn.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * $FreeBSD: src/sys/netncp/ncp_conn.c,v 1.3.2.5 2001/02/22 08:54:11 bp Exp $
- * $DragonFly: src/sys/netproto/ncp/ncp_conn.c,v 1.3 2003/06/25 03:56:05 dillon Exp $
+ * $DragonFly: src/sys/netproto/ncp/ncp_conn.c,v 1.4 2003/07/19 21:14:44 dillon Exp $
  *
  * Connection tables
  */
@@ -74,8 +74,8 @@ MALLOC_DEFINE(M_NCPDATA, "NCP data", "NCP private data");
 
 int
 ncp_conn_init(void) {
-	lockinit(&listlock, PSOCK, "ncpll", 0, 0);
-	lockinit(&lhlock, PSOCK, "ncplh", 0, 0);
+	lockinit(&listlock, 0, "ncpll", 0, 0);
+	lockinit(&lhlock, 0, "ncplh", 0, 0);
 	return 0;
 }
 
@@ -196,7 +196,7 @@ ncp_conn_alloc(struct thread *td, struct ucred *cred, struct ncp_conn **conn)
 	MALLOC(ncp, struct ncp_conn *, sizeof(struct ncp_conn), 
 	    M_NCPDATA, M_WAITOK | M_ZERO);
 	error = 0;
-	lockinit(&ncp->nc_lock, PZERO, "ncplck", 0, 0);
+	lockinit(&ncp->nc_lock, 0, "ncplck", 0, 0);
 	ncp_conn_cnt++;
 	ncp->nc_id = ncp_next_ref++;
 	ncp->nc_owner = cred;
@@ -244,7 +244,7 @@ ncp_conn_free(struct ncp_conn *ncp)
 	lockmgr(&ncp->nc_lock, LK_DRAIN, 0, ncp->td);
 	while (ncp->nc_lwant) {
 		printf("lwant = %d\n", ncp->nc_lwant);
-		tsleep(&ncp->nc_lwant, PZERO,"ncpdr",2*hz);
+		tsleep(&ncp->nc_lwant, 0, "ncpdr", 2*hz);
 	}
 	ncp_conn_locklist(LK_EXCLUSIVE, ncp->td);
 	/*
diff --git a/sys/netproto/ncp/ncp_sock.c b/sys/netproto/ncp/ncp_sock.c
index 48c2e72c80..6db49b5c08 100644
--- a/sys/netproto/ncp/ncp_sock.c
+++ b/sys/netproto/ncp/ncp_sock.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netncp/ncp_sock.c,v 1.2 1999/10/12 10:36:59 bp Exp $
- * $DragonFly: src/sys/netproto/ncp/ncp_sock.c,v 1.3 2003/06/25 03:56:05 dillon Exp $
+ * $DragonFly: src/sys/netproto/ncp/ncp_sock.c,v 1.4 2003/07/19 21:14:45 dillon Exp $
  *
  * Low level socket routines
  */
@@ -96,7 +96,7 @@ ncp_soconnect(struct socket *so,struct sockaddr *target, struct thread *td) {
 	error = EIO;
 	s = splnet();
 	while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-		(void) tsleep((caddr_t)&so->so_timeo, PSOCK, "ncpcon", 2 * hz);
+		(void) tsleep((caddr_t)&so->so_timeo, 0, "ncpcon", 2 * hz);
 		if ((so->so_state & SS_ISCONNECTING) &&
 		    so->so_error == 0 /*&& rep &&*/) {
 			so->so_state &= ~SS_ISCONNECTING;
@@ -179,7 +179,7 @@ ncp_sock_send(struct socket *so, struct mbuf *top, struct ncp_rq *rqp)
 			break;
 		if (rqp->rexmit == 0) break;
 		rqp->rexmit--;
-		tsleep(&sendwait, PWAIT, "ncprsn", conn->li.timeout * hz);
+		tsleep(&sendwait, 0, "ncprsn", conn->li.timeout * hz);
 		error = ncp_chkintr(conn, td);
 		if (error == EINTR) break;
 	}
@@ -237,7 +237,7 @@ retry:
 		goto retry;
 	}
 	p->p_flag &= ~P_SELECT;
-	error = tsleep((caddr_t)&selwait, PSOCK, "ncpslt", timo);
+	error = tsleep((caddr_t)&selwait, 0, "ncpslt", timo);
 	splx(s);
 done:
 	p->p_flag &= ~P_SELECT;
diff --git a/sys/netproto/smb/smb_conn.c b/sys/netproto/smb/smb_conn.c
index 89bbdc7e59..20d79cc7ff 100644
--- a/sys/netproto/smb/smb_conn.c
+++ b/sys/netproto/smb/smb_conn.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netsmb/smb_conn.c,v 1.1.2.1 2001/05/22 08:32:33 bp Exp $
- * $DragonFly: src/sys/netproto/smb/smb_conn.c,v 1.3 2003/06/25 03:56:06 dillon Exp $
+ * $DragonFly: src/sys/netproto/smb/smb_conn.c,v 1.4 2003/07/19 21:14:45 dillon Exp $
  */
 
 /*
@@ -225,7 +225,7 @@ smb_co_init(struct smb_connobj *cp, int level, char *objname, struct thread *td)
 {
 	SLIST_INIT(&cp->co_children);
 	smb_sl_init(&cp->co_interlock, objname);
-	lockinit(&cp->co_lock, PZERO, objname, 0, 0);
+	lockinit(&cp->co_lock, 0, objname, 0, 0);
 	cp->co_level = level;
 	cp->co_usecount = 1;
 	KASSERT(smb_co_lock(cp, LK_EXCLUSIVE, td) == 0,
diff --git a/sys/netproto/smb/smb_iod.c b/sys/netproto/smb/smb_iod.c
index 2cd4113fcf..babe22c92d 100644
--- a/sys/netproto/smb/smb_iod.c
+++ b/sys/netproto/smb/smb_iod.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netsmb/smb_iod.c,v 1.1.2.2 2002/04/23 03:45:01 bp Exp $
- * $DragonFly: src/sys/netproto/smb/smb_iod.c,v 1.5 2003/07/06 21:23:53 dillon Exp $
+ * $DragonFly: src/sys/netproto/smb/smb_iod.c,v 1.6 2003/07/19 21:14:45 dillon Exp $
  */
  
 #include <sys/param.h>
@@ -382,7 +382,7 @@ smb_iod_request(struct smbiod *iod, int event, void *ident)
 		return 0;
 	}
 	smb_iod_wakeup(iod);
-	smb_sleep(evp, SMB_IOD_EVLOCKPTR(iod), PWAIT | PDROP, "90evw", 0);
+	smb_sleep(evp, SMB_IOD_EVLOCKPTR(iod), PDROP, "90evw", 0);
 	error = evp->ev_error;
 	free(evp, M_SMBIOD);
 	return error;
@@ -415,7 +415,7 @@ smb_iod_addrq(struct smb_rq *rqp)
 			 */
 			if (rqp->sr_state != SMBRQ_NOTSENT)
 				break;
-			tsleep(&iod->iod_flags, PWAIT, "90sndw", hz);
+			tsleep(&iod->iod_flags, 0, "90sndw", hz);
 		}
 		if (rqp->sr_lerror)
 			smb_iod_removerq(rqp);
@@ -444,7 +444,7 @@ smb_iod_addrq(struct smb_rq *rqp)
 			break;
 		iod->iod_muxwant++;
 		smb_sleep(&iod->iod_muxwant, SMB_IOD_RQLOCKPTR(iod),
-		    PWAIT, "90mux", 0);
+		    0, "90mux", 0);
 	}
 	iod->iod_muxcnt++;
 	TAILQ_INSERT_TAIL(&iod->iod_rqlist, rqp, sr_link);
@@ -469,7 +469,7 @@ smb_iod_removerq(struct smb_rq *rqp)
 	SMB_IOD_RQLOCK(iod);
 	while (rqp->sr_flags & SMBR_XLOCK) {
 		rqp->sr_flags |= SMBR_XLOCKWANT;
-		smb_sleep(rqp, SMB_IOD_RQLOCKPTR(iod), PWAIT, "90xrm", 0);
+		smb_sleep(rqp, SMB_IOD_RQLOCKPTR(iod), 0, "90xrm", 0);
 	}
 	TAILQ_REMOVE(&iod->iod_rqlist, rqp, sr_link);
 	iod->iod_muxcnt--;
@@ -494,7 +494,7 @@ smb_iod_waitrq(struct smb_rq *rqp)
 			smb_iod_recvall(iod);
 			if (rqp->sr_rpgen != rqp->sr_rplast)
 				break;
-			tsleep(&iod->iod_flags, PWAIT, "90irq", hz);
+			tsleep(&iod->iod_flags, 0, "90irq", hz);
 		}
 		smb_iod_removerq(rqp);
 		return rqp->sr_lerror;
@@ -502,7 +502,7 @@ smb_iod_waitrq(struct smb_rq *rqp)
 	}
 	SMBRQ_SLOCK(rqp);
 	if (rqp->sr_rpgen == rqp->sr_rplast)
-		smb_sleep(&rqp->sr_state, SMBRQ_SLOCKPTR(rqp), PWAIT, "90wrq", 0);
+		smb_sleep(&rqp->sr_state, SMBRQ_SLOCKPTR(rqp), 0, "90wrq", 0);
 	rqp->sr_rplast++;
 	SMBRQ_SUNLOCK(rqp);
 	error = rqp->sr_lerror;
@@ -646,7 +646,7 @@ smb_iod_thread(void *arg)
 		SMBIODEBUG("going to sleep for %d ticks\n", iod->iod_sleeptimo);
 		if (iod->iod_flags & SMBIOD_SHUTDOWN)
 			break;
-		tsleep(&iod->iod_flags, PWAIT, "90idle", iod->iod_sleeptimo);
+		tsleep(&iod->iod_flags, 0, "90idle", iod->iod_sleeptimo);
 	}
 	kthread_exit();
 }
diff --git a/sys/netproto/smb/smb_rq.c b/sys/netproto/smb/smb_rq.c
index 759110e9c2..d52276bf90 100644
--- a/sys/netproto/smb/smb_rq.c
+++ b/sys/netproto/smb/smb_rq.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netsmb/smb_rq.c,v 1.1.2.2 2002/04/23 03:45:01 bp Exp $
- * $DragonFly: src/sys/netproto/smb/smb_rq.c,v 1.4 2003/07/06 21:23:53 dillon Exp $
+ * $DragonFly: src/sys/netproto/smb/smb_rq.c,v 1.5 2003/07/19 21:14:45 dillon Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -180,7 +180,7 @@ smb_rq_enqueue(struct smb_rq *rqp)
 		SMBS_ST_LOCK(ssp);
 		if (ssp->ss_flags & SMBS_RECONNECTING) {
 			smb_sleep(&ssp->ss_vcgenid, SMBS_ST_LOCKPTR(ssp),
-			    PWAIT | PDROP, "90trcn", hz);
+			    PDROP, "90trcn", hz);
 			if (smb_proc_intr(rqp->sr_cred->scr_td))
 				return EINTR;
 			continue;
diff --git a/sys/netproto/smb/smb_subr.c b/sys/netproto/smb/smb_subr.c
index 04685ca175..717260da43 100644
--- a/sys/netproto/smb/smb_subr.c
+++ b/sys/netproto/smb/smb_subr.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netsmb/smb_subr.c,v 1.1.2.2 2001/09/03 08:55:11 bp Exp $
- * $DragonFly: src/sys/netproto/smb/smb_subr.c,v 1.6 2003/07/06 21:23:53 dillon Exp $
+ * $DragonFly: src/sys/netproto/smb/smb_subr.c,v 1.7 2003/07/19 21:14:45 dillon Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -429,12 +429,12 @@ kthread_create2(void (*func)(void *), void *arg,
  * since we blocked, so reget or release as appropriate.
  */
 int
-smb_sleep(void *chan, struct lwkt_token *mtx, int pri, const char *wmesg, int timo)
+smb_sleep(void *chan, struct lwkt_token *mtx, int slpflags, const char *wmesg, int timo)
 {
 	int error;
 
-	error = tsleep(chan, pri, wmesg, timo);
-	if ((pri & PDROP) == 0 && mtx)
+	error = tsleep(chan, slpflags, wmesg, timo);
+	if ((slpflags & PDROP) == 0 && mtx)
 		lwkt_regettoken(mtx);
 	else
 		lwkt_reltoken(mtx);
diff --git a/sys/netproto/smb/smb_subr.h b/sys/netproto/smb/smb_subr.h
index fdc09641b8..32dd285a91 100644
--- a/sys/netproto/smb/smb_subr.h
+++ b/sys/netproto/smb/smb_subr.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netsmb/smb_subr.h,v 1.1.2.1 2001/05/22 08:32:34 bp Exp $
- * $DragonFly: src/sys/netproto/smb/smb_subr.h,v 1.5 2003/07/06 21:23:53 dillon Exp $
+ * $DragonFly: src/sys/netproto/smb/smb_subr.h,v 1.6 2003/07/19 21:14:45 dillon Exp $
  */
 #ifndef _NETSMB_SMB_SUBR_H_
 #define _NETSMB_SMB_SUBR_H_
@@ -47,7 +47,7 @@ MALLOC_DECLARE(M_SMBTEMP);
  * For compatibility with 5.x
  */
 #define	MODULE_VERSION(name, ver)
-#define	PDROP	0x200	/* OR'd with pri to stop re-entry of interlock mutex */
+#define	PDROP	PUSRFLAG1	/* OR'd with pri to stop re-entry of interlock mutex */
 
 #define SMBERROR(format, args...) printf("%s: "format, __FUNCTION__ ,## args)
 #define SMBPANIC(format, args...) printf("%s: "format, __FUNCTION__ ,## args)
@@ -172,7 +172,7 @@ int  smb_checksmp(void);
  */
 int kthread_create2(void (*func)(void *), void *arg,
     struct proc **newpp, int flags, const char *fmt, ...);
-int smb_sleep(void *chan, struct lwkt_token *mtx, int pri, const char *wmesg, int timo);
+int smb_sleep(void *chan, struct lwkt_token *mtx, int slpflags, const char *wmesg, int timo);
 
 
 #endif /* !_NETSMB_SMB_SUBR_H_ */
diff --git a/sys/netproto/smb/smb_trantcp.c b/sys/netproto/smb/smb_trantcp.c
index 306a4bfad3..5e195cbdde 100644
--- a/sys/netproto/smb/smb_trantcp.c
+++ b/sys/netproto/smb/smb_trantcp.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netsmb/smb_trantcp.c,v 1.3.2.1 2001/05/22 08:32:34 bp Exp $
- * $DragonFly: src/sys/netproto/smb/smb_trantcp.c,v 1.3 2003/06/25 03:56:06 dillon Exp $
+ * $DragonFly: src/sys/netproto/smb/smb_trantcp.c,v 1.4 2003/07/19 21:14:45 dillon Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -136,7 +136,7 @@ retry:
 		goto retry;
 	}
 	p->p_flag &= ~P_SELECT;
-	error = tsleep((caddr_t)&selwait, PSOCK, "nbsel", timo);
+	error = tsleep((caddr_t)&selwait, 0, "nbsel", timo);
 	splx(s);
 done:
 	p->p_flag &= ~P_SELECT;
@@ -219,7 +219,7 @@ nb_connect_in(struct nbpcb *nbp, struct sockaddr_in *to, struct thread *td)
 		goto bad;
 	s = splnet();
 	while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-		tsleep(&so->so_timeo, PSOCK, "nbcon", 2 * hz);
+		tsleep(&so->so_timeo, 0, "nbcon", 2 * hz);
 		if ((so->so_state & SS_ISCONNECTING) && so->so_error == 0 &&
 			(error = nb_intr(nbp, td)) != 0) {
 			so->so_state &= ~SS_ISCONNECTING;
diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c
index 2544c2f30c..83b69b2bcb 100644
--- a/sys/opencrypto/crypto.c
+++ b/sys/opencrypto/crypto.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.7 2003/06/03 00:09:02 sam Exp $	*/
-/*	$DragonFly: src/sys/opencrypto/crypto.c,v 1.5 2003/07/06 21:23:54 dillon Exp $	*/
+/*	$DragonFly: src/sys/opencrypto/crypto.c,v 1.6 2003/07/19 21:14:47 dillon Exp $	*/
 /*	$OpenBSD: crypto.c,v 1.38 2002/06/11 11:14:29 beck Exp $	*/
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -1125,7 +1125,7 @@ cryptoret(void)
 				krp->krp_callback(krp);
 			s  = splcrypto();
 		} else {
-			(void) tsleep(&crp_ret_q, PLOCK, "crypto_wait", 0);
+			(void) tsleep(&crp_ret_q, 0, "crypto_wait", 0);
 			cryptostats.cs_rets++;
 		}
 	}
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
index f319a36aa3..82ed905d84 100644
--- a/sys/opencrypto/cryptodev.c
+++ b/sys/opencrypto/cryptodev.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $	*/
-/*	$DragonFly: src/sys/opencrypto/cryptodev.c,v 1.3 2003/06/25 03:56:08 dillon Exp $	*/
+/*	$DragonFly: src/sys/opencrypto/cryptodev.c,v 1.4 2003/07/19 21:14:47 dillon Exp $	*/
 /*	$OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $	*/
 
 /*
@@ -419,7 +419,7 @@ cryptodev_op(
 	s = splcrypto();	/* NB: only needed with CRYPTO_F_CBIMM */
 	error = crypto_dispatch(crp);
 	if (error == 0 && (crp->crp_flags & CRYPTO_F_DONE) == 0)
-		error = tsleep(crp, PSOCK, "crydev", 0);
+		error = tsleep(crp, 0, "crydev", 0);
 	splx(s);
 	if (error)
 		goto bail;
@@ -538,7 +538,7 @@ cryptodev_key(struct crypt_kop *kop)
 
 	error = crypto_kdispatch(krp);
 	if (error == 0)
-		error = tsleep(krp, PSOCK, "crydev", 0);
+		error = tsleep(krp, 0, "crydev", 0);
 	if (error)
 		goto fail;
 	
diff --git a/sys/platform/pc32/boot/dosboot/sysparam.h b/sys/platform/pc32/boot/dosboot/sysparam.h
index 715538ca5c..1efde9c4db 100644
--- a/sys/platform/pc32/boot/dosboot/sysparam.h
+++ b/sys/platform/pc32/boot/dosboot/sysparam.h
@@ -37,7 +37,7 @@
  *
  *	@(#)param.h	8.2 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/i386/boot/dosboot/sysparam.h,v 1.5 1999/08/28 00:43:25 peter Exp $
- * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/sysparam.h,v 1.3 2003/07/13 05:45:08 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/sysparam.h,v 1.4 2003/07/19 21:14:33 dillon Exp $
  */
 
 #ifndef _DOSBOOT_SYS_PARAM_H_
@@ -98,6 +98,7 @@ include <sys/rtprio.h>
  * Priorities.  Note that with 32 run queues, differences less than 4 are
  * insignificant.
  */
+#if 0
 #define	PSWP	0
 #define	PVM	4
 #define	PINOD	8
@@ -109,6 +110,7 @@ include <sys/rtprio.h>
 #define	PLOCK	36
 #define	PPAUSE	40
 #define	PUSER	50
+#endif
 #define	MAXPRI	127		/* Priorities range from 0 through MAXPRI. */
 
 #define	PRIMASK	0x0ff
diff --git a/sys/platform/pc32/gnu/isa/dgb.c b/sys/platform/pc32/gnu/isa/dgb.c
index 6e3ec0ed9b..de6269382f 100644
--- a/sys/platform/pc32/gnu/isa/dgb.c
+++ b/sys/platform/pc32/gnu/isa/dgb.c
@@ -1,6 +1,6 @@
 /*-
  *  dgb.c $FreeBSD: src/sys/gnu/i386/isa/dgb.c,v 1.56.2.1 2001/02/26 04:23:09 jlemon Exp $
- *  dgb.c $DragonFly: src/sys/platform/pc32/gnu/isa/dgb.c,v 1.3 2003/06/25 03:55:52 dillon Exp $
+ *  dgb.c $DragonFly: src/sys/platform/pc32/gnu/isa/dgb.c,v 1.4 2003/07/19 21:14:32 dillon Exp $
  *
  *  Digiboard driver.
  *
@@ -972,7 +972,7 @@ open_top:
 	s=spltty();
 
 	while(port->closing) {
-		error=tsleep(&port->closing, TTOPRI|PCATCH, "dgocl", 0);
+		error=tsleep(&port->closing, PCATCH, "dgocl", 0);
 
 		if(error) {
 			DPRINT4(DB_OPEN,"dgb%d: port%d: tsleep(dgocl) error=%d\n",unit,pnum,error);
@@ -999,7 +999,7 @@ open_top:
 					goto out;
 				}
 				error =	tsleep(&port->active_out,
-					       TTIPRI | PCATCH, "dgbi", 0);
+					       PCATCH, "dgbi", 0);
 				if (error != 0) {
 					DPRINT4(DB_OPEN,"dgb%d: port%d: tsleep(dgbi) error=%d\n",
 						unit,pnum,error);
@@ -1063,7 +1063,7 @@ open_top:
 	if (!(tp->t_state & TS_CARR_ON) && !(mynor & CALLOUT_MASK)
 	    && !(tp->t_cflag & CLOCAL) && !(flag & O_NONBLOCK)) {
 		++port->wopeners;
-		error = tsleep(TSA_CARR_ON(tp), TTIPRI | PCATCH, "dgdcd", 0);
+		error = tsleep(TSA_CARR_ON(tp), PCATCH, "dgdcd", 0);
 		--port->wopeners;
 		if (error != 0) {
 			DPRINT4(DB_OPEN,"dgb%d: port%d: tsleep(dgdcd) error=%d\n",unit,pnum,error);
@@ -1180,7 +1180,7 @@ dgbhardclose(port)
 	splx(cs);
 
 	timeout(dgb_pause, &port->brdchan, hz/2);
-	tsleep(&port->brdchan, TTIPRI | PCATCH, "dgclo", 0);
+	tsleep(&port->brdchan, PCATCH, "dgclo", 0);
 }
 
 static void 
@@ -1784,7 +1784,7 @@ dgbdrain(port)
 		hidewin(sc);
 		port->draining=1;
 		timeout(wakeflush,port, hz);
-		error=tsleep(&port->draining, TTIPRI | PCATCH, "dgdrn", 0);
+		error=tsleep(&port->draining, PCATCH, "dgdrn", 0);
 		port->draining=0;
 		setwin(sc,0);
 
@@ -1842,7 +1842,7 @@ dgb_drain_or_flush(port)
 		hidewin(sc);
 		port->draining=1;
 		timeout(wakeflush,port, hz);
-		error=tsleep(&port->draining, TTIPRI | PCATCH, "dgfls", 0);
+		error=tsleep(&port->draining, PCATCH, "dgfls", 0);
 		port->draining=0;
 		setwin(sc,0);
 
diff --git a/sys/platform/pc32/i386/mem.c b/sys/platform/pc32/i386/mem.c
index 8a2fe26cc3..82bf399255 100644
--- a/sys/platform/pc32/i386/mem.c
+++ b/sys/platform/pc32/i386/mem.c
@@ -39,7 +39,7 @@
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $
- * $DragonFly: src/sys/platform/pc32/i386/Attic/mem.c,v 1.5 2003/07/04 05:57:25 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/Attic/mem.c,v 1.6 2003/07/19 21:14:33 dillon Exp $
  */
 
 /*
@@ -253,8 +253,7 @@ mmrw(dev, uio, flags)
 				 * Use tsleep() to get the error code right.
 				 * It should return immediately.
 				 */
-				error = tsleep(&rand_bolt,
-				    PZERO | PCATCH, "urand", 1);
+				error = tsleep(&rand_bolt, PCATCH, "urand", 1);
 				if (error != 0 && error != EWOULDBLOCK)
 					continue;
 			}
diff --git a/sys/platform/pc32/isa/asc.c b/sys/platform/pc32/isa/asc.c
index b749f075d6..512df07b30 100644
--- a/sys/platform/pc32/isa/asc.c
+++ b/sys/platform/pc32/isa/asc.c
@@ -35,7 +35,7 @@
  */
 /*
  * $FreeBSD: src/sys/i386/isa/asc.c,v 1.42.2.2 2001/03/01 03:22:39 jlemon Exp $
- * $DragonFly: src/sys/platform/pc32/isa/asc.c,v 1.2 2003/06/17 04:28:36 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/isa/asc.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  */
 
 #include "asc.h"
@@ -78,7 +78,6 @@
 #endif
 
 #define TIMEOUT (hz*15)  /* timeout while reading a buffer - default value */
-#define ASCPRI  PRIBIO   /* priority while reading a buffer */
 
 /***
  *** LAYOUT OF THE MINOR NUMBER
@@ -223,10 +222,10 @@ get_resolution(struct asc_unit *scu)
     res=0;
     scu->cmd_byte = ASC_STANDBY;
     outb(ASC_CMD, scu->cmd_byte);
-    tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascres", hz/10);
+    tsleep((caddr_t)scu, PCATCH, "ascres", hz/10);
     for(delay= 100; (res=inb(ASC_STAT)) & ASC_RDY_FLAG; delay--)
     {
-        i = tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascres0", 1);
+        i = tsleep((caddr_t)scu, PCATCH, "ascres0", 1);
         if ( ( i == 0 ) || ( i == EWOULDBLOCK ) )
 	    i = SUCCESS;
 	else
@@ -343,7 +342,7 @@ asc_reset(struct asc_unit *scu)
 
   outb(ASC_CFG,scu->cfg_byte);	/* for safety, do this here */
   outb(ASC_CMD,scu->cmd_byte);	/* probably not needed */
-  tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascres", hz/10); /* sleep .1 sec */
+  tsleep((caddr_t)scu, PCATCH, "ascres", hz/10); /* sleep .1 sec */
 
   scu->blen = DEFAULT_BLEN;
   scu->btime = TIMEOUT;
@@ -626,7 +625,7 @@ asc_startread(struct asc_unit *scu)
     /*** sub_28: light on etc...***/
   scu->cmd_byte = ASC_STANDBY;
   outb(ASC_CMD, scu->cmd_byte);
-  tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascstrd", hz/10); /* sleep .1 sec */
+  tsleep((caddr_t)scu, PCATCH, "ascstrd", hz/10); /* sleep .1 sec */
   return SUCCESS;
 }
 
@@ -656,7 +655,7 @@ ascclose(dev_t dev, int flags, int fmt, struct proc *p)
   outb(ASC_CFG, 0 ); /* don't save in CFG byte!!! */
   scu->cmd_byte &= ~ASC_LIGHT_ON;
   outb(ASC_CMD, scu->cmd_byte);/* light off */
-  tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascclo", hz/2); /* sleep 1/2 sec */
+  tsleep((caddr_t)scu, PCATCH, "ascclo", hz/2); /* sleep 1/2 sec */
   scu->cfg_byte &= ~ scu->dma_byte ; /* disable scanner dma */
   scu->cfg_byte &= ~ scu->int_byte ; /* disable scanner int */
   outb(ASC_CFG, scu->cfg_byte);
@@ -732,13 +731,13 @@ ascread(dev_t dev, struct uio *uio, int ioflag)
   if ( scu->sbuf.count == 0 ) { /* no data avail., must wait */
       if (!(scu->flags & DMA_ACTIVE)) dma_restart(scu);
       scu->flags |= SLEEPING;
-      res = tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascread", 0);
+      res = tsleep((caddr_t)scu, PCATCH, "ascread", 0);
       scu->flags &= ~SLEEPING;
       if ( res == 0 ) res = SUCCESS;
   }
   splx(sps); /* lower priority... */
   if (scu->flags & FLAG_DEBUG)
-      tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascdly",hz);
+      tsleep((caddr_t)scu, PCATCH, "ascdly",hz);
   lprintf("asc%d.read(after): "
       "sz 0x%x, rptr 0x%x, wptr 0x%x, cnt 0x%x bcnt 0x%x flags 0x%x icnt %ld\n",
 	  unit, scu->sbuf.size, scu->sbuf.rptr,
diff --git a/sys/platform/pc32/isa/atapi.c b/sys/platform/pc32/isa/atapi.c
index 9b3bf5ed14..77b9fec806 100644
--- a/sys/platform/pc32/isa/atapi.c
+++ b/sys/platform/pc32/isa/atapi.c
@@ -14,7 +14,7 @@
  * Version 1.9, Mon Oct  9 22:34:47 MSK 1995
  *
  * $FreeBSD: src/sys/i386/isa/atapi.c,v 1.36.2.1 2000/04/03 20:13:06 n_hibma Exp $
- * $DragonFly: src/sys/platform/pc32/isa/Attic/atapi.c,v 1.2 2003/06/17 04:28:36 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/isa/Attic/atapi.c,v 1.3 2003/07/19 21:14:34 dillon Exp $
  */
 
 /*
@@ -480,7 +480,7 @@ static struct atapicmd *atapi_alloc (struct atapi *ata)
 	struct atapicmd *ac;
 
 	while (! ata->free)
-		tsleep ((caddr_t)ata, PRIBIO, "atacmd", 100);
+		tsleep ((caddr_t)ata, 0, "atacmd", 100);
 	ac = ata->free;
 	ata->free = ac->next;
 	ac->busy = 1;
@@ -859,7 +859,7 @@ struct atapires atapi_request_wait (struct atapi *ata, int unit,
 	atapi_enqueue (ata, ac);
 	wdstart (ata->ctrlr);
 	if (ata->tail == ac)
-		tsleep ((caddr_t)ac, PRIBIO, "atareq", 0);
+		tsleep ((caddr_t)ac, 0, "atareq", 0);
 
 	result = ac->result;
 	atapi_free (ata, ac);
diff --git a/sys/platform/pc32/isa/sound/os.h b/sys/platform/pc32/isa/sound/os.h
index a03581bd8f..9fca967b56 100644
--- a/sys/platform/pc32/isa/sound/os.h
+++ b/sys/platform/pc32/isa/sound/os.h
@@ -2,7 +2,7 @@
  * os.h -- only included by sound_config.h right after local.h
  *
  * $FreeBSD: src/sys/i386/isa/sound/os.h,v 1.40.2.1 2000/08/03 01:01:27 peter Exp $
- * $DragonFly: src/sys/platform/pc32/isa/sound/Attic/os.h,v 1.2 2003/06/17 04:28:38 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/isa/sound/Attic/os.h,v 1.3 2003/07/19 21:14:36 dillon Exp $
  */
 
 #ifndef _OS_H_
@@ -57,7 +57,7 @@ typedef struct sound_os_info {
 	{ \
 	  int flag; \
 	  f.mode = WK_SLEEP; \
-	  flag=tsleep(&q, (PRIBIO-5)|PCATCH, "sndint", time_limit); \
+	  flag=tsleep(&q, PCATCH, "sndint", time_limit); \
 	  f.mode &= ~WK_SLEEP; \
 	  if (flag == EWOULDBLOCK) { \
 		f.mode |= WK_TIMEOUT; \
@@ -70,7 +70,7 @@ typedef struct sound_os_info {
 	{ \
 	  int flag; \
 	  f.mode = WK_SLEEP; \
-	  flag=tsleep(&q, (PRIBIO-5)|PCATCH, "snd1", time_limit); \
+	  flag=tsleep(&q, PCATCH, "snd1", time_limit); \
 	  f.mode &= ~WK_SLEEP; \
 	  if (flag == EWOULDBLOCK) { \
 		f.mode |= WK_TIMEOUT; \
@@ -83,7 +83,7 @@ typedef struct sound_os_info {
 	{ \
 	  int flag; \
 	  f.mode = WK_SLEEP; \
-	  flag=tsleep(&q, (PRIBIO-5)|PCATCH, "snd2", time_limit); \
+	  flag=tsleep(&q, PCATCH, "snd2", time_limit); \
 	  f.mode &= ~WK_SLEEP; \
 	  if (flag == EWOULDBLOCK) { \
 		f.mode |= WK_TIMEOUT; \
diff --git a/sys/sys/buf2.h b/sys/sys/buf2.h
index 4796b1b9c3..c13bcd9497 100644
--- a/sys/sys/buf2.h
+++ b/sys/sys/buf2.h
@@ -37,7 +37,7 @@
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/sys/buf.h,v 1.88.2.10 2003/01/25 19:02:23 dillon Exp $
- * $DragonFly: src/sys/sys/buf2.h,v 1.3 2003/07/06 21:23:54 dillon Exp $
+ * $DragonFly: src/sys/sys/buf2.h,v 1.4 2003/07/19 21:14:50 dillon Exp $
  */
 
 #ifndef _SYS_BUF2_H_
@@ -49,7 +49,7 @@
  * Initialize a lock.
  */
 #define BUF_LOCKINIT(bp) \
-	lockinit(&(bp)->b_lock, PRIBIO + 4, buf_wmesg, 0, 0)
+	lockinit(&(bp)->b_lock, 0, buf_wmesg, 0, 0)
 
 /*
  *
@@ -65,7 +65,7 @@ BUF_LOCK(struct buf *bp, int locktype)
 	lwkt_gettoken(&buftimetoken);
 	locktype |= LK_INTERLOCK;
 	bp->b_lock.lk_wmesg = buf_wmesg;
-	bp->b_lock.lk_prio = PRIBIO + 4;
+	bp->b_lock.lk_prio = 0;		/* tsleep flags */
 	/* bp->b_lock.lk_timo = 0;   not necessary */
 	ret = lockmgr(&(bp)->b_lock, locktype, &buftimetoken, curthread);
 	splx(s);
@@ -84,7 +84,7 @@ BUF_TIMELOCK(struct buf *bp, int locktype, char *wmesg, int catch, int timo)
 	lwkt_gettoken(&buftimetoken);
 	locktype |= LK_INTERLOCK | LK_TIMELOCK;
 	bp->b_lock.lk_wmesg = wmesg;
-	bp->b_lock.lk_prio = (PRIBIO + 4) | catch;
+	bp->b_lock.lk_prio = catch;	/* tsleep flags */
 	bp->b_lock.lk_timo = timo;
 	ret = lockmgr(&(bp)->b_lock, (locktype), &buftimetoken, curthread);
 	splx(s);
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 87f5608f64..f742a25516 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -36,7 +36,7 @@
  *
  *	@(#)lock.h	8.12 (Berkeley) 5/19/95
  * $FreeBSD: src/sys/sys/lock.h,v 1.17.2.3 2001/12/25 01:44:44 dillon Exp $
- * $DragonFly: src/sys/sys/lock.h,v 1.4 2003/07/06 21:23:54 dillon Exp $
+ * $DragonFly: src/sys/sys/lock.h,v 1.5 2003/07/19 21:14:50 dillon Exp $
  */
 
 #ifndef	_LOCK_H_
@@ -60,7 +60,7 @@ struct lock {
 	int	lk_sharecount;		/* # of accepted shared locks */
 	int	lk_waitcount;		/* # of processes sleeping for lock */
 	short	lk_exclusivecount;	/* # of recursive exclusive locks */
-	short	lk_prio;		/* priority at which to sleep */
+	short	lk_prio;		/* tsleep flags */
 	char	*lk_wmesg;		/* resource sleeping (for tsleep) */
 	int	lk_timo;		/* maximum sleep time (for tsleep) */
 	struct thread *lk_lockholder;	/* thread of excl lock holder */
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 0351089f4c..9ba0c793ad 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -37,7 +37,7 @@
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
  * $FreeBSD: src/sys/sys/param.h,v 1.61.2.38 2003/05/22 17:12:01 fjoe Exp $
- * $DragonFly: src/sys/sys/param.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/param.h,v 1.3 2003/07/19 21:14:50 dillon Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -109,6 +109,7 @@
  * Priorities.  Note that with 32 run queues, differences less than 4 are
  * insignificant.
  */
+#if 0
 #define	PSWP	0
 #define	PVM	4
 #define	PINOD	8
@@ -120,11 +121,12 @@
 #define	PCONFIG	32
 #define	PLOCK	36
 #define	PPAUSE	40
+#endif
 #define	PUSER	50
 #define	MAXPRI	127		/* Priorities range from 0 through MAXPRI. */
 
-#define	PRIMASK	0x0ff
-#define	PCATCH	0x100		/* OR'd with pri for tsleep to check signals */
+#define	PCATCH		0x0100	/* OR'd with pri for tsleep to check signals */
+#define PUSRFLAG1	0x0200	/* Subsystem specific flag */
 
 #define	NZERO	0		/* default "nice" */
 
diff --git a/sys/sys/rman.h b/sys/sys/rman.h
index e182296f04..e5baa5ba7f 100644
--- a/sys/sys/rman.h
+++ b/sys/sys/rman.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/rman.h,v 1.5.2.1 2001/06/05 08:06:07 imp Exp $
- * $DragonFly: src/sys/sys/rman.h,v 1.3 2003/07/06 21:23:54 dillon Exp $
+ * $DragonFly: src/sys/sys/rman.h,v 1.4 2003/07/19 21:14:50 dillon Exp $
  */
 
 #ifndef _SYS_RMAN_H_
@@ -87,7 +87,7 @@ TAILQ_HEAD(rman_head, rman);
 #ifdef _KERNEL
 
 int	rman_activate_resource(struct resource *r);
-int	rman_await_resource(struct resource *r, int pri, int timo);
+int	rman_await_resource(struct resource *r, int slpflags, int timo);
 int	rman_deactivate_resource(struct resource *r);
 int	rman_fini(struct rman *rm);
 int	rman_init(struct rman *rm);
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 2df40b681f..cd5f33555c 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -37,7 +37,7 @@
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
  * $FreeBSD: src/sys/sys/systm.h,v 1.111.2.18 2002/12/17 18:04:02 sam Exp $
- * $DragonFly: src/sys/sys/systm.h,v 1.8 2003/06/29 03:28:46 dillon Exp $
+ * $DragonFly: src/sys/sys/systm.h,v 1.9 2003/07/19 21:14:50 dillon Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
@@ -341,10 +341,7 @@ extern watchdog_tickle_fn	wdog_tickler;
  * Common `proc' functions are declared here so that proc.h can be included
  * less often.
  */
-int	tsleep __P((void *chan, int pri, const char *wmesg, int timo));
-int	xsleep __P((struct xwait *w, int pri, const char *wmesg, int timo, int *gen));
-void	xwakeup __P((struct xwait *w));
-void	xwait_init __P((struct xwait *w));
+int	tsleep __P((void *chan, int slpflags, const char *wmesg, int timo));
 void	wakeup __P((void *chan));
 void	wakeup_one __P((void *chan));
 
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index e758845060..0266f2c88d 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -37,7 +37,7 @@
  *
  *	@(#)tty.h	8.6 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/sys/tty.h,v 1.53.2.1 2001/02/26 04:23:21 jlemon Exp $
- * $DragonFly: src/sys/sys/tty.h,v 1.3 2003/06/23 17:55:50 dillon Exp $
+ * $DragonFly: src/sys/sys/tty.h,v 1.4 2003/07/19 21:14:50 dillon Exp $
  */
 
 #ifndef _SYS_TTY_H_
@@ -116,9 +116,6 @@ struct tty {
 #define	t_ospeed	t_termios.c_ospeed
 #define	t_time		t_termios.c_time
 
-#define	TTIPRI	25			/* Sleep priority for tty reads. */
-#define	TTOPRI	26			/* Sleep priority for tty writes. */
-
 /*
  * User data unfortunately has to be copied through buffers on the way to
  * and from clists.  The buffers are on the stack so their sizes must be
@@ -267,7 +264,7 @@ int	 ttypoll __P((dev_t dev, int events, struct thread *td));
 int	 ttykqfilter __P((dev_t dev, struct knote *kn));
 int	 ttyread __P((dev_t dev, struct uio *uio, int flag));
 void	 ttyregister __P((struct tty *tp));
-int	 ttysleep __P((struct tty *tp, void *chan, int pri, char *wmesg,
+int	 ttysleep __P((struct tty *tp, void *chan, int slpflags, char *wmesg,
 	    int timeout));
 int	 ttywait __P((struct tty *tp));
 int	 ttywrite __P((dev_t dev, struct uio *uio, int flag));
diff --git a/sys/vfs/coda/coda_psdev.c b/sys/vfs/coda/coda_psdev.c
index f164a6f830..e9d9b3f476 100644
--- a/sys/vfs/coda/coda_psdev.c
+++ b/sys/vfs/coda/coda_psdev.c
@@ -28,7 +28,7 @@
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
  * $FreeBSD: src/sys/coda/coda_psdev.c,v 1.13 1999/09/29 15:03:46 marcel Exp $
- * $DragonFly: src/sys/vfs/coda/Attic/coda_psdev.c,v 1.4 2003/06/26 05:55:07 dillon Exp $
+ * $DragonFly: src/sys/vfs/coda/Attic/coda_psdev.c,v 1.5 2003/07/19 21:14:15 dillon Exp $
  * 
  */
 
@@ -83,7 +83,6 @@ extern int coda_nc_initialized;    /* Set if cache has been initialized */
 int coda_psdev_print_entry = 0;
 static
 int outstanding_upcalls = 0;
-int coda_call_sleep = PZERO - 1;
 #ifdef	CTL_C
 int coda_pcatch = PCATCH;
 #else
@@ -209,10 +208,10 @@ vc_nb_close (dev_t dev, int flag, int mode, d_thread_t *td)
     if (outstanding_upcalls) {
 #ifdef	CODA_VERBOSE
 	printf("presleep: outstanding_upcalls = %d\n", outstanding_upcalls);
-    	(void) tsleep(&outstanding_upcalls, coda_call_sleep, "coda_umount", 0);
+    	(void) tsleep(&outstanding_upcalls, 0, "coda_umount", 0);
 	printf("postsleep: outstanding_upcalls = %d\n", outstanding_upcalls);
 #else
-    	(void) tsleep(&outstanding_upcalls, coda_call_sleep, "coda_umount", 0);
+    	(void) tsleep(&outstanding_upcalls, 0, "coda_umount", 0);
 #endif
     }
 
@@ -531,9 +530,7 @@ coda_call(mntinfo, inSize, outSize, buffer)
 	 */
 	i = 0;
 	do {
-		error = tsleep(&vmp->vm_sleep,
-			       (coda_call_sleep|coda_pcatch), "coda_call",
-			       hz*2);
+		error = tsleep(&vmp->vm_sleep, coda_pcatch, "coda_call", hz*2);
 		if (error == 0)
 			break;
 		else if (error == EWOULDBLOCK) {
@@ -584,7 +581,7 @@ coda_call(mntinfo, inSize, outSize, buffer)
 	} while (error && i++ < 128 && VC_OPEN(vcp));
 	p->p_sigmask = psig_omask;
 #else
-	(void) tsleep(&vmp->vm_sleep, coda_call_sleep, "coda_call", 0);
+	(void) tsleep(&vmp->vm_sleep, 0, "coda_call", 0);
 #endif
 	if (VC_OPEN(vcp)) {	/* Venus is still alive */
  	/* Op went through, interrupt or not... */
diff --git a/sys/vfs/coda/coda_vnops.c b/sys/vfs/coda/coda_vnops.c
index 205e7fc6d1..2264dde46c 100644
--- a/sys/vfs/coda/coda_vnops.c
+++ b/sys/vfs/coda/coda_vnops.c
@@ -28,7 +28,7 @@
  * 
  *  	@(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
  * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.22.2.1 2001/06/29 16:26:22 shafeeq Exp $
- * $DragonFly: src/sys/vfs/coda/Attic/coda_vnops.c,v 1.6 2003/06/26 20:27:51 dillon Exp $
+ * $DragonFly: src/sys/vfs/coda/Attic/coda_vnops.c,v 1.7 2003/07/19 21:14:15 dillon Exp $
  * 
  */
 
@@ -1935,7 +1935,7 @@ make_coda_node(fid, vfsp, type)
 	struct vnode *vp;
 	
 	cp = coda_alloc();
-	lockinit(&cp->c_lock, PINOD, "cnode", 0, 0);
+	lockinit(&cp->c_lock, 0, "cnode", 0, 0);
 	cp->c_fid = *fid;
 	
 	err = getnewvnode(VT_CODA, vfsp, coda_vnodeop_p, &vp);  
diff --git a/sys/vfs/deadfs/dead_vnops.c b/sys/vfs/deadfs/dead_vnops.c
index 3c77270a25..3462792418 100644
--- a/sys/vfs/deadfs/dead_vnops.c
+++ b/sys/vfs/deadfs/dead_vnops.c
@@ -32,7 +32,7 @@
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/miscfs/deadfs/dead_vnops.c,v 1.26 1999/08/28 00:46:42 peter Exp $
- * $DragonFly: src/sys/vfs/deadfs/dead_vnops.c,v 1.3 2003/07/06 21:23:51 dillon Exp $
+ * $DragonFly: src/sys/vfs/deadfs/dead_vnops.c,v 1.4 2003/07/19 21:14:40 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -278,7 +278,7 @@ chkvnlock(vp)
 
 	while (vp->v_flag & VXLOCK) {
 		vp->v_flag |= VXWANT;
-		(void) tsleep((caddr_t)vp, PINOD, "ckvnlk", 0);
+		(void) tsleep((caddr_t)vp, 0, "ckvnlk", 0);
 		locked = 1;
 	}
 	return (locked);
diff --git a/sys/vfs/fdesc/fdesc_vnops.c b/sys/vfs/fdesc/fdesc_vnops.c
index 959d1ef62c..56d85c81a5 100644
--- a/sys/vfs/fdesc/fdesc_vnops.c
+++ b/sys/vfs/fdesc/fdesc_vnops.c
@@ -36,7 +36,7 @@
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
  * $FreeBSD: src/sys/miscfs/fdesc/fdesc_vnops.c,v 1.47.2.1 2001/10/22 22:49:26 chris Exp $
- * $DragonFly: src/sys/vfs/fdesc/fdesc_vnops.c,v 1.4 2003/06/25 03:55:58 dillon Exp $
+ * $DragonFly: src/sys/vfs/fdesc/fdesc_vnops.c,v 1.5 2003/07/19 21:14:40 dillon Exp $
  */
 
 /*
@@ -125,7 +125,7 @@ loop:
 	 */
 	if (fdcache_lock & FDL_LOCKED) {
 		fdcache_lock |= FDL_WANT;
-		(void) tsleep((caddr_t) &fdcache_lock, PINOD, "fdalvp", 0);
+		(void) tsleep((caddr_t) &fdcache_lock, 0, "fdalvp", 0);
 		goto loop;
 	}
 	fdcache_lock |= FDL_LOCKED;
diff --git a/sys/vfs/fifofs/fifo_vnops.c b/sys/vfs/fifofs/fifo_vnops.c
index 4750f231ec..5470a988b8 100644
--- a/sys/vfs/fifofs/fifo_vnops.c
+++ b/sys/vfs/fifofs/fifo_vnops.c
@@ -32,7 +32,7 @@
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
  * $FreeBSD: src/sys/miscfs/fifofs/fifo_vnops.c,v 1.45.2.4 2003/04/22 10:11:24 bde Exp $
- * $DragonFly: src/sys/vfs/fifofs/fifo_vnops.c,v 1.4 2003/06/26 05:55:15 dillon Exp $
+ * $DragonFly: src/sys/vfs/fifofs/fifo_vnops.c,v 1.5 2003/07/19 21:14:41 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -227,7 +227,7 @@ fifo_open(ap)
 		if (fip->fi_writers == 0) {
 			VOP_UNLOCK(vp, 0, ap->a_td);
 			error = tsleep((caddr_t)&fip->fi_readers,
-			    PCATCH | PSOCK, "fifoor", 0);
+			    PCATCH, "fifoor", 0);
 			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, ap->a_td);
 			if (error)
 				goto bad;
@@ -248,7 +248,7 @@ fifo_open(ap)
 			if (fip->fi_readers == 0) {
 				VOP_UNLOCK(vp, 0, ap->a_td);
 				error = tsleep((caddr_t)&fip->fi_writers,
-				    PCATCH | PSOCK, "fifoow", 0);
+				    PCATCH, "fifoow", 0);
 				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, ap->a_td);
 				if (error)
 					goto bad;
diff --git a/sys/vfs/gnu/ext2fs/ext2_vfsops.c b/sys/vfs/gnu/ext2fs/ext2_vfsops.c
index 0a64d79223..4a73d4a6d1 100644
--- a/sys/vfs/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/vfs/gnu/ext2fs/ext2_vfsops.c
@@ -38,7 +38,7 @@
  *
  *	@(#)ffs_vfsops.c	8.8 (Berkeley) 4/18/94
  *	$FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.63.2.7 2002/07/01 00:18:51 iedowse Exp $
- *	$DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vfsops.c,v 1.5 2003/07/08 09:57:10 dillon Exp $
+ *	$DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vfsops.c,v 1.6 2003/07/19 21:14:32 dillon Exp $
  */
 
 #include "opt_quota.h"
@@ -1027,7 +1027,7 @@ restart:
 	if (ext2fs_inode_hash_lock) {
 		while (ext2fs_inode_hash_lock) {
 			ext2fs_inode_hash_lock = -1;
-			tsleep(&ext2fs_inode_hash_lock, PVM, "e2vget", 0);
+			tsleep(&ext2fs_inode_hash_lock, 0, "e2vget", 0);
 		}
 		goto restart;
 	}
@@ -1052,7 +1052,7 @@ restart:
 		return (error);
 	}
 	bzero((caddr_t)ip, sizeof(struct inode));
-	lockinit(&ip->i_lock, PINOD, "ext2in", 0, 0);
+	lockinit(&ip->i_lock, 0, "ext2in", 0, 0);
 	vp->v_data = ip;
 	ip->i_vnode = vp;
 	ip->i_e2fs = fs = ump->um_e2fs;
diff --git a/sys/vfs/gnu/ext2fs/ext2_vnops.c b/sys/vfs/gnu/ext2fs/ext2_vnops.c
index 6aa5ce7530..015d997f1e 100644
--- a/sys/vfs/gnu/ext2fs/ext2_vnops.c
+++ b/sys/vfs/gnu/ext2fs/ext2_vnops.c
@@ -44,7 +44,7 @@
  *	@(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
  *	@(#)ext2_vnops.c	8.7 (Berkeley) 2/3/94
  * $FreeBSD: src/sys/gnu/ext2fs/ext2_vnops.c,v 1.51.2.2 2003/01/02 17:26:18 bde Exp $
- * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vnops.c,v 1.3 2003/06/25 03:55:52 dillon Exp $
+ * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vnops.c,v 1.4 2003/07/19 21:14:32 dillon Exp $
  */
 
 #include "opt_quota.h"
@@ -235,7 +235,7 @@ loop:
 	if (ap->a_waitfor == MNT_WAIT) {
 		while (vp->v_numoutput) {
 			vp->v_flag |= VBWAIT;
-			tsleep(&vp->v_numoutput, PRIBIO + 1, "e2fsyn", 0);
+			tsleep(&vp->v_numoutput, 0, "e2fsyn", 0);
 		}
 #if DIAGNOSTIC
 		if (!TAILQ_EMPTY(&vp->v_dirtyblkhd)) {
diff --git a/sys/vfs/hpfs/hpfs_hash.c b/sys/vfs/hpfs/hpfs_hash.c
index 78e86db47d..2eb0954f55 100644
--- a/sys/vfs/hpfs/hpfs_hash.c
+++ b/sys/vfs/hpfs/hpfs_hash.c
@@ -32,7 +32,7 @@
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
  * $FreeBSD: src/sys/fs/hpfs/hpfs_hash.c,v 1.1 1999/12/09 19:09:58 semenu Exp $
- * $DragonFly: src/sys/vfs/hpfs/hpfs_hash.c,v 1.4 2003/07/08 09:57:07 dillon Exp $
+ * $DragonFly: src/sys/vfs/hpfs/hpfs_hash.c,v 1.5 2003/07/19 21:14:31 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -66,7 +66,7 @@ void
 hpfs_hphashinit()
 {
 
-	lockinit (&hpfs_hphash_lock, PINOD, "hpfs_hphashlock", 0, 0);
+	lockinit (&hpfs_hphash_lock, 0, "hpfs_hphashlock", 0, 0);
 	hpfs_hphashtbl = HASHINIT(desiredvnodes, M_HPFSHASH, M_WAITOK,
 	    &hpfs_hphash);
 	lwkt_inittoken(&hpfs_hphash_token);
diff --git a/sys/vfs/hpfs/hpfs_vfsops.c b/sys/vfs/hpfs/hpfs_vfsops.c
index e3081da870..a09b360660 100644
--- a/sys/vfs/hpfs/hpfs_vfsops.c
+++ b/sys/vfs/hpfs/hpfs_vfsops.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.3.2.2 2001/12/25 01:44:45 dillon Exp $
- * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.4 2003/07/06 21:23:47 dillon Exp $
+ * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.5 2003/07/19 21:14:31 dillon Exp $
  */
 
 
@@ -669,7 +669,7 @@ hpfs_vget(
 		vp->v_flag |= VROOT;
 
 	lwkt_inittoken(&hp->h_interlock);
-	lockinit(&hp->h_lock, PINOD, "hpnode", VLKTIMEOUT, 0);
+	lockinit(&hp->h_lock, 0, "hpnode", VLKTIMEOUT, 0);
 
 	hp->h_flag = H_INVAL;
 	hp->h_vp = vp;
diff --git a/sys/vfs/hpfs/hpfs_vnops.c b/sys/vfs/hpfs/hpfs_vnops.c
index 67e9bde986..543f8bd160 100644
--- a/sys/vfs/hpfs/hpfs_vnops.c
+++ b/sys/vfs/hpfs/hpfs_vnops.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.2.2.2 2002/01/15 18:35:09 semenu Exp $
- * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.4 2003/07/06 21:23:47 dillon Exp $
+ * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.5 2003/07/19 21:14:31 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -141,7 +141,7 @@ loop:
 	}
 	while (vp->v_numoutput) {
 		vp->v_flag |= VBWAIT;
-		(void) tsleep((caddr_t)&vp->v_numoutput, PRIBIO + 1, "hpfsn", 0);
+		(void) tsleep((caddr_t)&vp->v_numoutput, 0, "hpfsn", 0);
 	}
 #ifdef DIAGNOSTIC
 	if (!TAILQ_EMPTY(&vp->v_dirtyblkhd)) {
diff --git a/sys/vfs/isofs/cd9660/cd9660_vfsops.c b/sys/vfs/isofs/cd9660/cd9660_vfsops.c
index ef0aa97eec..6ef303f155 100644
--- a/sys/vfs/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/vfs/isofs/cd9660/cd9660_vfsops.c
@@ -37,7 +37,7 @@
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
  * $FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.74.2.7 2002/04/08 09:39:29 bde Exp $
- * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vfsops.c,v 1.5 2003/06/26 05:55:13 dillon Exp $
+ * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vfsops.c,v 1.6 2003/07/19 21:14:38 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -734,7 +734,7 @@ cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
 	MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE,
 	    M_WAITOK);
 	bzero((caddr_t)ip, sizeof(struct iso_node));
-	lockinit(&ip->i_lock, PINOD, "isonode", 0, 0);
+	lockinit(&ip->i_lock, 0, "isonode", 0, 0);
 	vp->v_data = ip;
 	ip->i_vnode = vp;
 	ip->i_dev = dev;
diff --git a/sys/vfs/mfs/mfs_vfsops.c b/sys/vfs/mfs/mfs_vfsops.c
index 6f62d6dc59..a7028b5e5d 100644
--- a/sys/vfs/mfs/mfs_vfsops.c
+++ b/sys/vfs/mfs/mfs_vfsops.c
@@ -32,7 +32,7 @@
  *
  *	@(#)mfs_vfsops.c	8.11 (Berkeley) 6/19/95
  * $FreeBSD: src/sys/ufs/mfs/mfs_vfsops.c,v 1.81.2.3 2001/07/04 17:35:21 tegge Exp $
- * $DragonFly: src/sys/vfs/mfs/mfs_vfsops.c,v 1.5 2003/07/06 21:23:55 dillon Exp $
+ * $DragonFly: src/sys/vfs/mfs/mfs_vfsops.c,v 1.6 2003/07/19 21:14:52 dillon Exp $
  */
 
 
@@ -304,9 +304,6 @@ success:
 	return( err);
 }
 
-
-static int	mfs_pri = PWAIT | PCATCH;		/* XXX prob. temp */
-
 /*
  * Used to grab the process and keep it in the kernel to service
  * memory filesystem I/O requests.
@@ -369,7 +366,7 @@ mfs_start(struct mount *mp, int flags, struct thread *td)
 					SIGDELSET(td->td_proc->p_siglist, sig);
 			}
 		}
-		else if (tsleep((caddr_t)vp, mfs_pri, "mfsidl", 0))
+		else if (tsleep((caddr_t)vp, PCATCH, "mfsidl", 0))
 			gotsig++;	/* try to unmount in next pass */
 	}
 	return (0);
diff --git a/sys/vfs/msdosfs/msdosfs_denode.c b/sys/vfs/msdosfs/msdosfs_denode.c
index 8d9ef30c57..aa0f62e8ec 100644
--- a/sys/vfs/msdosfs/msdosfs_denode.c
+++ b/sys/vfs/msdosfs/msdosfs_denode.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/msdosfs/msdosfs_denode.c,v 1.47.2.3 2002/08/22 16:20:15 trhodes Exp $ */
-/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_denode.c,v 1.5 2003/07/06 21:23:52 dillon Exp $ */
+/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_denode.c,v 1.6 2003/07/19 21:14:43 dillon Exp $ */
 /*	$NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $	*/
 
 /*-
@@ -260,7 +260,7 @@ deget(pmp, dirclust, diroffset, depp)
 		return error;
 	}
 	bzero((caddr_t)ldep, sizeof *ldep);
-	lockinit(&ldep->de_lock, PINOD, "denode", VLKTIMEOUT, 0);
+	lockinit(&ldep->de_lock, 0, "denode", VLKTIMEOUT, 0);
 	nvp->v_data = ldep;
 	ldep->de_vnode = nvp;
 	ldep->de_flag = 0;
diff --git a/sys/vfs/msdosfs/msdosfs_vnops.c b/sys/vfs/msdosfs/msdosfs_vnops.c
index 8e2c131ab3..3811e4793a 100644
--- a/sys/vfs/msdosfs/msdosfs_vnops.c
+++ b/sys/vfs/msdosfs/msdosfs_vnops.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/msdosfs/msdosfs_vnops.c,v 1.95.2.4 2003/06/13 15:05:47 trhodes Exp $ */
-/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.7 2003/07/06 21:23:52 dillon Exp $ */
+/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.8 2003/07/19 21:14:43 dillon Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
@@ -882,7 +882,7 @@ loop:
 	}
 	while (vp->v_numoutput) {
 		vp->v_flag |= VBWAIT;
-		(void) tsleep((caddr_t)&vp->v_numoutput, PRIBIO + 1, "msdosfsn", 0);
+		(void) tsleep((caddr_t)&vp->v_numoutput, 0, "msdosfsn", 0);
 	}
 #ifdef DIAGNOSTIC
 	if (!TAILQ_EMPTY(&vp->v_dirtyblkhd)) {
diff --git a/sys/vfs/nfs/bootp_subr.c b/sys/vfs/nfs/bootp_subr.c
index b076e96234..5a2785be35 100644
--- a/sys/vfs/nfs/bootp_subr.c
+++ b/sys/vfs/nfs/bootp_subr.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/nfs/bootp_subr.c,v 1.20.2.9 2003/04/24 16:51:08 ambrisko Exp $	*/
-/* $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.2 2003/06/17 04:28:54 dillon Exp $	*/
+/* $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.3 2003/07/19 21:14:45 dillon Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -774,7 +774,7 @@ bootpc_call(struct bootpc_globalcontext *gctx,
 			}
 
 			/* XXX: Is this needed ? */
-			tsleep(&error, PZERO + 8, "bootpw", 10);
+			tsleep(&error, 0, "bootpw", 10);
 			
 			/* Set netmask to 255.0.0.0 */
 			
@@ -1714,7 +1714,7 @@ bootpc_init(void)
 	 * Wait until arp entries can be handled.
 	 */
 	while (time_second == 0)
-		tsleep(&time_second, PZERO + 8, "arpkludge", 10);
+		tsleep(&time_second, 0, "arpkludge", 10);
 	
 	gctx = malloc(sizeof(*gctx), M_TEMP, M_WAITOK);
 	if (gctx == NULL)
diff --git a/sys/vfs/nfs/nfs_bio.c b/sys/vfs/nfs/nfs_bio.c
index 0e4aadf5bf..47b469036b 100644
--- a/sys/vfs/nfs/nfs_bio.c
+++ b/sys/vfs/nfs/nfs_bio.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_bio.c	8.9 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/nfs/nfs_bio.c,v 1.83.2.4 2002/12/29 18:19:53 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_bio.c,v 1.6 2003/06/26 05:55:18 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_bio.c,v 1.7 2003/07/19 21:14:45 dillon Exp $
  */
 
 
@@ -1163,8 +1163,7 @@ nfs_vinvalbuf(struct vnode *vp, int flags,
 	 */
 	while (np->n_flag & NFLUSHINPROG) {
 		np->n_flag |= NFLUSHWANT;
-		error = tsleep((caddr_t)&np->n_flag, PRIBIO + 2, "nfsvinval",
-			slptimeo);
+		error = tsleep((caddr_t)&np->n_flag, 0, "nfsvinval", slptimeo);
 		if (error && intrflg && nfs_sigintr(nmp, (struct nfsreq *)0, td))
 			return (EINTR);
 	}
@@ -1281,7 +1280,7 @@ again:
 			NFS_DPF(ASYNCIO,
 				("nfs_asyncio: waiting for mount %p queue to drain\n", nmp));
 			nmp->nm_bufqwant = TRUE;
-			error = tsleep(&nmp->nm_bufq, slpflag | PRIBIO,
+			error = tsleep(&nmp->nm_bufq, slpflag,
 				       "nfsaio", slptimeo);
 			if (error) {
 				if (nfs_sigintr(nmp, NULL, td))
diff --git a/sys/vfs/nfs/nfs_node.c b/sys/vfs/nfs/nfs_node.c
index eb1d2c91a7..eefb86cd8a 100644
--- a/sys/vfs/nfs/nfs_node.c
+++ b/sys/vfs/nfs/nfs_node.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
  * $FreeBSD: src/sys/nfs/nfs_node.c,v 1.36.2.3 2002/01/05 22:25:04 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_node.c,v 1.4 2003/06/26 05:55:18 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_node.c,v 1.5 2003/07/19 21:14:45 dillon Exp $
  */
 
 
@@ -124,7 +124,7 @@ loop:
 	if (nfs_node_hash_lock) {
 		while (nfs_node_hash_lock) {
 			nfs_node_hash_lock = -1;
-			tsleep(&nfs_node_hash_lock, PVM, "nfsngt", 0);
+			tsleep(&nfs_node_hash_lock, 0, "nfsngt", 0);
 		}
 		goto loop;
 	}
@@ -171,8 +171,8 @@ loop:
 		np->n_fhp = &np->n_fh;
 	bcopy((caddr_t)fhp, (caddr_t)np->n_fhp, fhsize);
 	np->n_fhsize = fhsize;
-	lockinit(&np->n_rslock, PVFS | rsflags, "nfrslk", 0, LK_NOPAUSE);
-	lockinit(&np->n_lock, PVFS, "nfsnlk", 0, LK_NOPAUSE);
+	lockinit(&np->n_rslock, rsflags, "nfrslk", 0, LK_NOPAUSE);
+	lockinit(&np->n_lock, 0, "nfsnlk", 0, LK_NOPAUSE);
 	*npp = np;
 
 	if (nfs_node_hash_lock < 0)
@@ -304,7 +304,7 @@ nfs_lock(ap)
 	 */
 	while (vp->v_flag & VXLOCK) {
 		vp->v_flag |= VXWANT;
-		(void) tsleep((caddr_t)vp, PINOD, "nfslck", 0);
+		(void) tsleep((caddr_t)vp, 0, "nfslck", 0);
 	}
 	if (vp->v_tag == VT_NON)
 		return (ENOENT);
@@ -323,7 +323,7 @@ nfs_lock(ap)
 	if (vp->v_type == VREG || vp->v_type == VNON) {
 		while (np->n_flag & NLOCKED) {
 			np->n_flag |= NWANTED;
-			(void) tsleep((caddr_t) np, PINOD, "nfslck2", 0);
+			(void) tsleep((caddr_t) np, 0, "nfslck2", 0);
 			/*
 			 * If the vnode has transmuted into a VDIR while we
 			 * were asleep, then skip the lock.
diff --git a/sys/vfs/nfs/nfs_nqlease.c b/sys/vfs/nfs/nfs_nqlease.c
index c58c975bb3..184ffb20c8 100644
--- a/sys/vfs/nfs/nfs_nqlease.c
+++ b/sys/vfs/nfs/nfs_nqlease.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_nqlease.c	8.9 (Berkeley) 5/20/95
  * $FreeBSD: src/sys/nfs/nfs_nqlease.c,v 1.50 2000/02/13 03:32:05 peter Exp $
- * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.5 2003/07/06 21:23:53 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.6 2003/07/19 21:14:45 dillon Exp $
  */
 
 
@@ -303,8 +303,7 @@ doreply:
 	if (nfsstats.srvnqnfs_leases > nqsrv_maxnumlease) {
 		printf("Nqnfs server, too many leases\n");
 		do {
-			(void) tsleep((caddr_t)&lbolt, PSOCK,
-					"nqsrvnuml", 0);
+			(void) tsleep((caddr_t)&lbolt, 0, "nqsrvnuml", 0);
 		} while (nfsstats.srvnqnfs_leases > nqsrv_maxnumlease);
 	}
 	MALLOC(lp, struct nqlease *, sizeof (struct nqlease), M_NQLEASE, M_WAITOK);
@@ -612,8 +611,7 @@ tryagain:
 	while (ok && (lph->lph_flag & LC_VALID)) {
 		if ((lph->lph_flag & (LC_LOCAL | LC_VACATED)) == 0) {
 			lp->lc_flag |= LC_EXPIREDWANTED;
-			(void) tsleep((caddr_t)&lp->lc_flag, PSOCK,
-					"nqexp", 0);
+			(void) tsleep((caddr_t)&lp->lc_flag, 0, "nqexp", 0);
 			goto tryagain;
 		}
 		if (++i == len) {
@@ -1135,7 +1133,7 @@ nqnfs_clientd(nmp, cred, ncd, flag, argp, td)
 	     */
 	    if ((nmp->nm_state & NFSSTA_DISMNT) == 0 &&
 		(nmp->nm_state & (NFSSTA_WAITAUTH | NFSSTA_HASAUTH))) {
-		    error = tsleep((caddr_t)&nmp->nm_authstr, PSOCK | PCATCH,
+		    error = tsleep((caddr_t)&nmp->nm_authstr, PCATCH,
 			"nqnfstimr", hz / 3);
 		    if (error == EINTR || error == ERESTART)
 			(void) dounmount(nmp->nm_mountp, 0, td);
@@ -1219,7 +1217,7 @@ nqsrv_locklease(lp)
 
 	while (lp->lc_flag & LC_LOCKED) {
 		lp->lc_flag |= LC_WANTED;
-		(void) tsleep((caddr_t)lp, PSOCK, "nqlc", 0);
+		(void) tsleep((caddr_t)lp, 0, "nqlc", 0);
 	}
 	lp->lc_flag |= LC_LOCKED;
 	lp->lc_flag &= ~LC_WANTED;
diff --git a/sys/vfs/nfs/nfs_socket.c b/sys/vfs/nfs/nfs_socket.c
index d99784c9de..37ce28ff5b 100644
--- a/sys/vfs/nfs/nfs_socket.c
+++ b/sys/vfs/nfs/nfs_socket.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/nfs/nfs_socket.c,v 1.60.2.6 2003/03/26 01:44:46 alfred Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.4 2003/07/01 18:48:31 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.5 2003/07/19 21:14:45 dillon Exp $
  */
 
 /*
@@ -278,7 +278,7 @@ nfs_connect(struct nfsmount *nmp, struct nfsreq *rep)
 		 */
 		s = splnet();
 		while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-			(void) tsleep((caddr_t)&so->so_timeo, PSOCK,
+			(void) tsleep((caddr_t)&so->so_timeo, 0,
 				"nfscon", 2 * hz);
 			if ((so->so_state & SS_ISCONNECTING) &&
 			    so->so_error == 0 && rep &&
@@ -391,7 +391,7 @@ nfs_reconnect(rep)
 	while ((error = nfs_connect(nmp, rep)) != 0) {
 		if (error == EINTR || error == ERESTART)
 			return (EINTR);
-		(void) tsleep((caddr_t)&lbolt, PSOCK, "nfscon", 0);
+		(void) tsleep((caddr_t)&lbolt, 0, "nfscon", 0);
 	}
 
 	/*
@@ -1155,7 +1155,7 @@ tryagain:
 				waituntil = time_second + trylater_delay;
 				while (time_second < waituntil)
 					(void) tsleep((caddr_t)&lbolt,
-						PSOCK, "nqnfstry", 0);
+						0, "nqnfstry", 0);
 				trylater_delay *= nfs_backoff[trylater_cnt];
 				if (trylater_cnt < 7)
 					trylater_cnt++;
@@ -1535,7 +1535,7 @@ nfs_nmcancelreqs(nmp)
 		splx(s);
 		if (req == NULL)
 			return (0);
-		tsleep(&lbolt, PSOCK, "nfscancel", 0);
+		tsleep(&lbolt, 0, "nfscancel", 0);
 	}
 	return (EBUSY);
 }
@@ -1608,7 +1608,7 @@ nfs_sndlock(struct nfsreq *rep)
 		if (nfs_sigintr(rep->r_nmp, rep, td))
 			return (EINTR);
 		*statep |= NFSSTA_WANTSND;
-		(void) tsleep((caddr_t)statep, slpflag | (PZERO - 1),
+		(void) tsleep((caddr_t)statep, slpflag,
 			"nfsndlck", slptimeo);
 		if (slpflag == PCATCH) {
 			slpflag = 0;
@@ -1655,8 +1655,7 @@ nfs_rcvlock(rep)
 		if (nfs_sigintr(rep->r_nmp, rep, rep->r_td))
 			return (EINTR);
 		*statep |= NFSSTA_WANTRCV;
-		(void) tsleep((caddr_t)statep, slpflag | (PZERO - 1), "nfsrcvlk",
-			slptimeo);
+		(void) tsleep((caddr_t)statep, slpflag, "nfsrcvlk", slptimeo);
 		/*
 		 * If our reply was recieved while we were sleeping,
 		 * then just return without taking the lock to avoid a
diff --git a/sys/vfs/nfs/nfs_srvcache.c b/sys/vfs/nfs/nfs_srvcache.c
index 168b7b1086..b854cc6ab3 100644
--- a/sys/vfs/nfs/nfs_srvcache.c
+++ b/sys/vfs/nfs/nfs_srvcache.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_srvcache.c	8.3 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/nfs/nfs_srvcache.c,v 1.21 2000/02/13 03:32:06 peter Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_srvcache.c,v 1.2 2003/06/17 04:28:54 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_srvcache.c,v 1.3 2003/07/19 21:14:45 dillon Exp $
  */
 
 /*
@@ -180,7 +180,7 @@ loop:
 		        NFS_DPF(RC, ("H%03x", rp->rc_xid & 0xfff));
 			if ((rp->rc_flag & RC_LOCKED) != 0) {
 				rp->rc_flag |= RC_WANTED;
-				(void) tsleep((caddr_t)rp, PZERO-1, "nfsrc", 0);
+				(void) tsleep((caddr_t)rp, 0, "nfsrc", 0);
 				goto loop;
 			}
 			rp->rc_flag |= RC_LOCKED;
@@ -229,7 +229,7 @@ loop:
 		rp = nfsrvlruhead.tqh_first;
 		while ((rp->rc_flag & RC_LOCKED) != 0) {
 			rp->rc_flag |= RC_WANTED;
-			(void) tsleep((caddr_t)rp, PZERO-1, "nfsrc", 0);
+			(void) tsleep((caddr_t)rp, 0, "nfsrc", 0);
 			rp = nfsrvlruhead.tqh_first;
 		}
 		rp->rc_flag |= RC_LOCKED;
@@ -287,7 +287,7 @@ loop:
 			NFS_DPF(RC, ("U%03x", rp->rc_xid & 0xfff));
 			if ((rp->rc_flag & RC_LOCKED) != 0) {
 				rp->rc_flag |= RC_WANTED;
-				(void) tsleep((caddr_t)rp, PZERO-1, "nfsrc", 0);
+				(void) tsleep((caddr_t)rp, 0, "nfsrc", 0);
 				goto loop;
 			}
 			rp->rc_flag |= RC_LOCKED;
diff --git a/sys/vfs/nfs/nfs_syscalls.c b/sys/vfs/nfs/nfs_syscalls.c
index 5827c5b923..bcb7eb7279 100644
--- a/sys/vfs/nfs/nfs_syscalls.c
+++ b/sys/vfs/nfs/nfs_syscalls.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/nfs/nfs_syscalls.c,v 1.58.2.1 2000/11/26 02:30:06 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.5 2003/06/26 05:55:18 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.6 2003/07/19 21:14:45 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -157,7 +157,7 @@ nfssvc(struct nfssvc_args *uap)
 	KKASSERT(td->td_proc);	/* for ucred and p_fd */
 	while (nfssvc_sockhead_flag & SLP_INIT) {
 		 nfssvc_sockhead_flag |= SLP_WANTINIT;
-		(void) tsleep((caddr_t)&nfssvc_sockhead, PSOCK, "nfsd init", 0);
+		(void) tsleep((caddr_t)&nfssvc_sockhead, 0, "nfsd init", 0);
 	}
 	if (uap->flag & NFSSVC_BIOD)
 		error = nfssvc_iod(td);
@@ -442,8 +442,7 @@ nfssvc_nfsd(struct nfsd_srvargs *nsd, caddr_t argp, struct thread *td)
 			    (nfsd_head_flag & NFSD_CHECKSLP) == 0) {
 				nfsd->nfsd_flag |= NFSD_WAITING;
 				nfsd_waiting++;
-				error = tsleep((caddr_t)nfsd, PSOCK | PCATCH,
-				    "nfsd", 0);
+				error = tsleep((caddr_t)nfsd, PCATCH, "nfsd", 0);
 				nfsd_waiting--;
 				if (error)
 					goto done;
@@ -782,7 +781,7 @@ nfs_slplock(slp, wait)
 		return(0);	/* already locked, fail */
 	while (*statep & NFSSTA_SNDLOCK) {
 		*statep |= NFSSTA_WANTSND;
-		(void) tsleep((caddr_t)statep, PZERO - 1, "nfsslplck", 0);
+		(void) tsleep((caddr_t)statep, 0, "nfsslplck", 0);
 	}
 	*statep |= NFSSTA_SNDLOCK;
 	return (1);
@@ -935,7 +934,7 @@ nfssvc_iod(struct thread *td)
 		nfs_iodwant[myiod] = td;
 		nfs_iodmount[myiod] = NULL;
 		error = tsleep((caddr_t)&nfs_iodwant[myiod],
-			PWAIT | PCATCH, "nfsidl", 0);
+			PCATCH, "nfsidl", 0);
 	    }
 	    if (error) {
 		nfs_asyncdaemon[myiod] = 0;
@@ -991,7 +990,7 @@ nfs_getauth(nmp, rep, cred, auth_str, auth_len, verf_str, verf_len, key)
 
 	while ((nmp->nm_state & NFSSTA_WAITAUTH) == 0) {
 		nmp->nm_state |= NFSSTA_WANTAUTH;
-		(void) tsleep((caddr_t)&nmp->nm_authtype, PSOCK,
+		(void) tsleep((caddr_t)&nmp->nm_authtype, 0,
 			"nfsauth1", 2 * hz);
 		error = nfs_sigintr(nmp, rep, rep->r_td);
 		if (error) {
@@ -1011,7 +1010,7 @@ nfs_getauth(nmp, rep, cred, auth_str, auth_len, verf_str, verf_len, key)
 	 * And wait for mount_nfs to do its stuff.
 	 */
 	while ((nmp->nm_state & NFSSTA_HASAUTH) == 0 && error == 0) {
-		(void) tsleep((caddr_t)&nmp->nm_authlen, PSOCK,
+		(void) tsleep((caddr_t)&nmp->nm_authlen, 0,
 			"nfsauth2", 2 * hz);
 		error = nfs_sigintr(nmp, rep, rep->r_td);
 	}
diff --git a/sys/vfs/nfs/nfs_vfsops.c b/sys/vfs/nfs/nfs_vfsops.c
index 2c1d91f951..34e3cf46ef 100644
--- a/sys/vfs/nfs/nfs_vfsops.c
+++ b/sys/vfs/nfs/nfs_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
  * $FreeBSD: src/sys/nfs/nfs_vfsops.c,v 1.91.2.7 2003/01/27 20:04:08 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_vfsops.c,v 1.4 2003/06/26 05:55:18 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_vfsops.c,v 1.5 2003/07/19 21:14:45 dillon Exp $
  */
 
 #include "opt_bootp.h"
@@ -408,7 +408,7 @@ nfs_mountroot(mp)
 	 * the arp code will wedge...
 	 */
 	while (time_second == 0)
-		tsleep(&time_second, PZERO+8, "arpkludge", 10);
+		tsleep(&time_second, 0, "arpkludge", 10);
 
 	if (nfs_diskless_valid==1) 
 	  nfs_convert_diskless();
@@ -732,8 +732,7 @@ nfs_decode_args(nmp, argp)
 		if (nmp->nm_sotype == SOCK_DGRAM)
 			while (nfs_connect(nmp, (struct nfsreq *)0)) {
 				printf("nfs_args: retrying connect\n");
-				(void) tsleep((caddr_t)&lbolt,
-					      PSOCK, "nfscon", 0);
+				(void) tsleep((caddr_t)&lbolt, 0, "nfscon", 0);
 			}
 	}
 }
@@ -982,7 +981,7 @@ nfs_unmount(struct mount *mp, int mntflags, struct thread *td)
 	 */
 	nmp->nm_state |= NFSSTA_DISMINPROG;
 	while (nmp->nm_inprog != NULLVP)
-		(void) tsleep((caddr_t)&lbolt, PSOCK, "nfsdism", 0);
+		(void) tsleep((caddr_t)&lbolt, 0, "nfsdism", 0);
 
 	/* We hold 1 extra ref on the root vnode; see comment in mountnfs(). */
 	error = vflush(mp, 1, flags);
diff --git a/sys/vfs/nfs/nfs_vnops.c b/sys/vfs/nfs/nfs_vnops.c
index 103b978c3a..d11c8ceea0 100644
--- a/sys/vfs/nfs/nfs_vnops.c
+++ b/sys/vfs/nfs/nfs_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
  * $FreeBSD: src/sys/nfs/nfs_vnops.c,v 1.150.2.5 2001/12/20 19:56:28 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.6 2003/06/26 20:27:52 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.7 2003/07/19 21:14:45 dillon Exp $
  */
 
 
@@ -2974,7 +2974,7 @@ loop:
 		while (vp->v_numoutput) {
 			vp->v_flag |= VBWAIT;
 			error = tsleep((caddr_t)&vp->v_numoutput,
-				slpflag | (PRIBIO + 1), "nfsfsync", slptimeo);
+				slpflag, "nfsfsync", slptimeo);
 			if (error) {
 			    if (nfs_sigintr(nmp, (struct nfsreq *)0, td)) {
 				error = EINTR;
diff --git a/sys/vfs/ntfs/ntfs_ihash.c b/sys/vfs/ntfs/ntfs_ihash.c
index 9569f5efb7..d358287675 100644
--- a/sys/vfs/ntfs/ntfs_ihash.c
+++ b/sys/vfs/ntfs/ntfs_ihash.c
@@ -34,7 +34,7 @@
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
  * $FreeBSD: src/sys/ntfs/ntfs_ihash.c,v 1.7 1999/12/03 20:37:39 semenu Exp $
- * $DragonFly: src/sys/vfs/ntfs/ntfs_ihash.c,v 1.3 2003/07/06 21:23:53 dillon Exp $
+ * $DragonFly: src/sys/vfs/ntfs/ntfs_ihash.c,v 1.4 2003/07/19 21:14:46 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -67,7 +67,7 @@ struct lock ntfs_hashlock;
 void
 ntfs_nthashinit()
 {
-	lockinit(&ntfs_hashlock, PINOD, "ntfs_nthashlock", 0, 0);
+	lockinit(&ntfs_hashlock, 0, "ntfs_nthashlock", 0, 0);
 	ntfs_nthashtbl = HASHINIT(desiredvnodes, M_NTFSNTHASH, M_WAITOK,
 	    &ntfs_nthash);
 	lwkt_inittoken(&ntfs_nthash_slock);
diff --git a/sys/vfs/ntfs/ntfs_subr.c b/sys/vfs/ntfs/ntfs_subr.c
index 052e7a6613..8e8badcbd0 100644
--- a/sys/vfs/ntfs/ntfs_subr.c
+++ b/sys/vfs/ntfs/ntfs_subr.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/ntfs/ntfs_subr.c,v 1.7.2.4 2001/10/12 22:08:49 semenu Exp $
- * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.c,v 1.5 2003/07/06 21:23:53 dillon Exp $
+ * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.c,v 1.6 2003/07/19 21:14:46 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -408,7 +408,7 @@ ntfs_ntlookup(
 	VREF(ip->i_devvp);
 
 	/* init lock and lock the newborn ntnode */
-	lockinit(&ip->i_lock, PINOD, "ntnode", 0, LK_EXCLUSIVE);
+	lockinit(&ip->i_lock, 0, "ntnode", 0, LK_EXCLUSIVE);
 	lwkt_inittoken(&ip->i_interlock);
 	ntfs_ntget(ip);
 
@@ -1922,7 +1922,7 @@ void
 ntfs_toupper_init()
 {
 	ntfs_toupper_tab = (wchar *) NULL;
-	lockinit(&ntfs_toupper_lock, PVFS, "ntfs_toupper", 0, 0);
+	lockinit(&ntfs_toupper_lock, 0, "ntfs_toupper", 0, 0);
 	ntfs_toupper_usecount = 0;
 }
 
diff --git a/sys/vfs/ntfs/ntfs_vfsops.c b/sys/vfs/ntfs/ntfs_vfsops.c
index 6dd3b9e0ac..abc6010a6d 100644
--- a/sys/vfs/ntfs/ntfs_vfsops.c
+++ b/sys/vfs/ntfs/ntfs_vfsops.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/ntfs/ntfs_vfsops.c,v 1.20.2.5 2001/12/25 01:44:45 dillon Exp $
- * $DragonFly: src/sys/vfs/ntfs/ntfs_vfsops.c,v 1.5 2003/07/06 21:23:53 dillon Exp $
+ * $DragonFly: src/sys/vfs/ntfs/ntfs_vfsops.c,v 1.6 2003/07/19 21:14:46 dillon Exp $
  */
 
 
@@ -971,7 +971,7 @@ ntfs_vgetex(
 	dprintf(("ntfs_vget: vnode: %p for ntnode: %d\n", vp,ino));
 
 #ifdef __FreeBSD__
-	lockinit(&fp->f_lock, PINOD, "fnode", VLKTIMEOUT, 0);
+	lockinit(&fp->f_lock, 0, "fnode", VLKTIMEOUT, 0);
 #endif
 	fp->f_vp = vp;
 	vp->v_data = fp;
diff --git a/sys/vfs/nullfs/null_subr.c b/sys/vfs/nullfs/null_subr.c
index 72c1c0015b..a7aaf42b2e 100644
--- a/sys/vfs/nullfs/null_subr.c
+++ b/sys/vfs/nullfs/null_subr.c
@@ -36,7 +36,7 @@
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
  * $FreeBSD: src/sys/miscfs/nullfs/null_subr.c,v 1.21.2.4 2001/06/26 04:20:09 bp Exp $
- * $DragonFly: src/sys/vfs/nullfs/Attic/null_subr.c,v 1.3 2003/06/25 03:55:59 dillon Exp $
+ * $DragonFly: src/sys/vfs/nullfs/Attic/null_subr.c,v 1.4 2003/07/19 21:14:41 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ nullfs_init(vfsp)
 
 	NULLFSDEBUG("nullfs_init\n");		/* printed during system boot */
 	null_node_hashtbl = hashinit(NNULLNODECACHE, M_NULLFSHASH, &null_node_hash);
-	lockinit(&null_hashlock, PVFS, "nullhs", 0, 0);
+	lockinit(&null_hashlock, 0, "nullhs", 0, 0);
 	return (0);
 }
 
@@ -178,7 +178,7 @@ null_node_alloc(mp, lowervp, vpp)
 	vp = *vpp;
 
 	vp->v_type = lowervp->v_type;
-	lockinit(&xp->null_lock, PINOD, "nullnode", 0, LK_CANRECURSE);
+	lockinit(&xp->null_lock, 0, "nullnode", 0, LK_CANRECURSE);
 	xp->null_vnode = vp;
 	vp->v_data = xp;
 	xp->null_lowervp = lowervp;
diff --git a/sys/vfs/nwfs/nwfs_io.c b/sys/vfs/nwfs/nwfs_io.c
index 7acb087c4e..53ac8bfdf1 100644
--- a/sys/vfs/nwfs/nwfs_io.c
+++ b/sys/vfs/nwfs/nwfs_io.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/nwfs/nwfs_io.c,v 1.6.2.1 2000/10/25 02:11:10 bp Exp $
- * $DragonFly: src/sys/vfs/nwfs/nwfs_io.c,v 1.4 2003/06/26 05:55:19 dillon Exp $
+ * $DragonFly: src/sys/vfs/nwfs/nwfs_io.c,v 1.5 2003/07/19 21:14:47 dillon Exp $
  *
  */
 #include <sys/param.h>
@@ -606,7 +606,7 @@ nwfs_vinvalbuf(vp, flags, td, intrflg)
 	}
 	while (np->n_flag & NFLUSHINPROG) {
 		np->n_flag |= NFLUSHWANT;
-		error = tsleep((caddr_t)&np->n_flag, PRIBIO + 2, "nwfsvinv", slptimeo);
+		error = tsleep((caddr_t)&np->n_flag, 0, "nwfsvinv", slptimeo);
 		error = ncp_chkintr(NWFSTOCONN(VTONWFS(vp)), td);
 		if (error == EINTR && intrflg)
 			return EINTR;
diff --git a/sys/vfs/nwfs/nwfs_node.c b/sys/vfs/nwfs/nwfs_node.c
index dacba8d3c8..b0f6bb0139 100644
--- a/sys/vfs/nwfs/nwfs_node.c
+++ b/sys/vfs/nwfs/nwfs_node.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/nwfs/nwfs_node.c,v 1.3.2.8 2001/12/25 01:44:45 dillon Exp $
- * $DragonFly: src/sys/vfs/nwfs/nwfs_node.c,v 1.5 2003/07/06 21:23:54 dillon Exp $
+ * $DragonFly: src/sys/vfs/nwfs/nwfs_node.c,v 1.6 2003/07/19 21:14:47 dillon Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,7 +79,7 @@ SYSCTL_PROC(_vfs_nwfs, OID_AUTO, vnprint, CTLFLAG_WR|CTLTYPE_OPAQUE,
 void
 nwfs_hash_init(void) {
 	nwhashtbl = hashinit(desiredvnodes, M_NWFSHASH, &nwnodehash);
-	lockinit(&nwhashlock, PVFS, "nwfshl", 0, 0);
+	lockinit(&nwhashlock, 0, "nwfshl", 0, 0);
 }
 
 void
@@ -189,7 +189,7 @@ rescan:
 	*vpp = vp;
 	np->n_fid = fid;
 	np->n_flag |= NNEW;
-	lockinit(&np->n_lock, PINOD, "nwnode", VLKTIMEOUT, LK_CANRECURSE);
+	lockinit(&np->n_lock, 0, "nwnode", VLKTIMEOUT, LK_CANRECURSE);
 	nhpp = NWNOHASH(fid);
 	LIST_INSERT_HEAD(nhpp, np, n_hash);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
diff --git a/sys/vfs/portal/portal_vnops.c b/sys/vfs/portal/portal_vnops.c
index 4e11c5193d..d6ac0ae31b 100644
--- a/sys/vfs/portal/portal_vnops.c
+++ b/sys/vfs/portal/portal_vnops.c
@@ -36,7 +36,7 @@
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
  * $FreeBSD: src/sys/miscfs/portal/portal_vnops.c,v 1.38 1999/12/21 06:29:00 chris Exp $
- * $DragonFly: src/sys/vfs/portal/portal_vnops.c,v 1.4 2003/06/25 03:56:00 dillon Exp $
+ * $DragonFly: src/sys/vfs/portal/portal_vnops.c,v 1.5 2003/07/19 21:14:41 dillon Exp $
  */
 
 /*
@@ -289,7 +289,7 @@ portal_open(ap)
 			splx(s);
 			goto bad;
 		}
-		(void) tsleep((caddr_t) &so->so_timeo, PSOCK, "portalcon", 5 * hz);
+		(void) tsleep((caddr_t) &so->so_timeo, 0, "portalcon", 5 * hz);
 	}
 	splx(s);
 
diff --git a/sys/vfs/procfs/procfs_ctl.c b/sys/vfs/procfs/procfs_ctl.c
index ff2659f904..af25875fd0 100644
--- a/sys/vfs/procfs/procfs_ctl.c
+++ b/sys/vfs/procfs/procfs_ctl.c
@@ -38,7 +38,7 @@
  *
  * From:
  * $FreeBSD: src/sys/miscfs/procfs/procfs_ctl.c,v 1.20.2.2 2002/01/22 17:22:59 nectar Exp $
- * $DragonFly: src/sys/vfs/procfs/procfs_ctl.c,v 1.3 2003/06/23 17:55:44 dillon Exp $
+ * $DragonFly: src/sys/vfs/procfs/procfs_ctl.c,v 1.4 2003/07/19 21:14:42 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -253,14 +253,14 @@ procfs_control(curp, p, op)
 					(p->p_flag & P_TRACED) &&
 					(p->p_pptr == curp)) {
 				error = tsleep((caddr_t) p,
-						PWAIT|PCATCH, "procfsx", 0);
+						PCATCH, "procfsx", 0);
 			}
 			if (error == 0 && !TRACE_WAIT_P(curp, p))
 				error = EBUSY;
 		} else {
 			while (error == 0 && p->p_stat != SSTOP) {
 				error = tsleep((caddr_t) p,
-						PWAIT|PCATCH, "procfs", 0);
+						PCATCH, "procfs", 0);
 			}
 		}
 		return (error);
diff --git a/sys/vfs/procfs/procfs_subr.c b/sys/vfs/procfs/procfs_subr.c
index 8dd33be1a5..849e662a69 100644
--- a/sys/vfs/procfs/procfs_subr.c
+++ b/sys/vfs/procfs/procfs_subr.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_subr.c	8.6 (Berkeley) 5/14/95
  *
  * $FreeBSD: src/sys/miscfs/procfs/procfs_subr.c,v 1.26.2.3 2002/02/18 21:28:04 des Exp $
- * $DragonFly: src/sys/vfs/procfs/procfs_subr.c,v 1.3 2003/06/25 03:56:00 dillon Exp $
+ * $DragonFly: src/sys/vfs/procfs/procfs_subr.c,v 1.4 2003/07/19 21:14:42 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -111,7 +111,7 @@ loop:
 	 */
 	if (pfsvplock & PROCFS_LOCKED) {
 		pfsvplock |= PROCFS_WANT;
-		(void) tsleep((caddr_t) &pfsvplock, PINOD, "pfsavp", 0);
+		(void) tsleep((caddr_t) &pfsvplock, 0, "pfsavp", 0);
 		goto loop;
 	}
 	pfsvplock |= PROCFS_LOCKED;
@@ -261,7 +261,7 @@ procfs_rw(struct vop_read_args *ap)
 		return (EACCES);
 
 	while (pfs->pfs_lockowner) {
-		tsleep(&pfs->pfs_lockowner, PRIBIO, "pfslck", 0);
+		tsleep(&pfs->pfs_lockowner, 0, "pfslck", 0);
 	}
 	pfs->pfs_lockowner = curproc->p_pid;
 
diff --git a/sys/vfs/procfs/procfs_vnops.c b/sys/vfs/procfs/procfs_vnops.c
index 6bb049db8c..abe4c914ce 100644
--- a/sys/vfs/procfs/procfs_vnops.c
+++ b/sys/vfs/procfs/procfs_vnops.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
  * $FreeBSD: src/sys/miscfs/procfs/procfs_vnops.c,v 1.76.2.7 2002/01/22 17:22:59 nectar Exp $
- * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.5 2003/06/26 05:55:15 dillon Exp $
+ * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.6 2003/07/19 21:14:42 dillon Exp $
  */
 
 /*
@@ -288,7 +288,7 @@ procfs_ioctl(ap)
 	case PIOCWAIT:
 	  psp = (struct procfs_status *)ap->a_data;
 	  if (procp->p_step == 0) {
-	    error = tsleep(&procp->p_stype, PWAIT | PCATCH, "piocwait", 0);
+	    error = tsleep(&procp->p_stype, PCATCH, "piocwait", 0);
 	    if (error)
 	      return error;
 	  }
diff --git a/sys/vfs/smbfs/smbfs_io.c b/sys/vfs/smbfs/smbfs_io.c
index 8e1fcb00fd..a5c3e5acc9 100644
--- a/sys/vfs/smbfs/smbfs_io.c
+++ b/sys/vfs/smbfs/smbfs_io.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.3.2.3 2003/01/17 08:20:26 tjr Exp $
- * $DragonFly: src/sys/vfs/smbfs/smbfs_io.c,v 1.4 2003/06/26 05:55:12 dillon Exp $
+ * $DragonFly: src/sys/vfs/smbfs/smbfs_io.c,v 1.5 2003/07/19 21:14:32 dillon Exp $
  *
  */
 #include <sys/param.h>
@@ -635,7 +635,7 @@ smbfs_vinvalbuf(vp, flags, td, intrflg)
 	}
 	while (np->n_flag & NFLUSHINPROG) {
 		np->n_flag |= NFLUSHWANT;
-		error = tsleep((caddr_t)&np->n_flag, PRIBIO + 2, "smfsvinv", slptimeo);
+		error = tsleep((caddr_t)&np->n_flag, 0, "smfsvinv", slptimeo);
 		error = smb_proc_intr(td);
 		if (error == EINTR && intrflg)
 			return EINTR;
diff --git a/sys/vfs/smbfs/smbfs_node.c b/sys/vfs/smbfs/smbfs_node.c
index aac93538a9..8572f4944a 100644
--- a/sys/vfs/smbfs/smbfs_node.c
+++ b/sys/vfs/smbfs/smbfs_node.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.2.2.3 2003/01/17 08:20:26 tjr Exp $
- * $DragonFly: src/sys/vfs/smbfs/smbfs_node.c,v 1.4 2003/06/26 05:55:12 dillon Exp $
+ * $DragonFly: src/sys/vfs/smbfs/smbfs_node.c,v 1.5 2003/07/19 21:14:32 dillon Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -243,7 +243,7 @@ loop:
 	} else if (vp->v_type == VREG)
 		SMBERROR("new vnode '%s' born without parent ?\n", np->n_name);
 
-	lockinit(&np->n_lock, PINOD, "smbnode", VLKTIMEOUT, LK_CANRECURSE);
+	lockinit(&np->n_lock, 0, "smbnode", VLKTIMEOUT, LK_CANRECURSE);
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 
 	smbfs_hash_lock(smp, td);
diff --git a/sys/vfs/smbfs/smbfs_smb.c b/sys/vfs/smbfs/smbfs_smb.c
index 674a0a3e46..293d2d94b2 100644
--- a/sys/vfs/smbfs/smbfs_smb.c
+++ b/sys/vfs/smbfs/smbfs_smb.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/smbfs/smbfs_smb.c,v 1.1.2.2 2003/01/17 08:20:26 tjr Exp $
- * $DragonFly: src/sys/vfs/smbfs/smbfs_smb.c,v 1.2 2003/06/17 04:28:33 dillon Exp $
+ * $DragonFly: src/sys/vfs/smbfs/smbfs_smb.c,v 1.3 2003/07/19 21:14:32 dillon Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -966,7 +966,7 @@ smbfs_smb_trans2find2(struct smbfs_fctx *ctx)
 			 * I've didn't notice any problem, but put code
 			 * for it.
 			 */
-			 tsleep(&flags, PVFS, "fix95", tvtohz(&tv));
+			 tsleep(&flags, 0, "fix95", tvtohz(&tv));
 		}
 #endif
 	}
diff --git a/sys/vfs/smbfs/smbfs_vfsops.c b/sys/vfs/smbfs/smbfs_vfsops.c
index d61a565160..50d09378af 100644
--- a/sys/vfs/smbfs/smbfs_vfsops.c
+++ b/sys/vfs/smbfs/smbfs_vfsops.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.2.2.5 2003/01/17 08:20:26 tjr Exp $
- * $DragonFly: src/sys/vfs/smbfs/smbfs_vfsops.c,v 1.4 2003/06/26 05:55:12 dillon Exp $
+ * $DragonFly: src/sys/vfs/smbfs/smbfs_vfsops.c,v 1.5 2003/07/19 21:14:32 dillon Exp $
  */
 #include "opt_netsmb.h"
 #ifndef NETSMB
@@ -189,7 +189,7 @@ smbfs_mount(struct mount *mp, char *path, caddr_t data,
 	smp->sm_hash = hashinit(desiredvnodes, M_SMBFSHASH, &smp->sm_hashlen);
 	if (smp->sm_hash == NULL)
 		goto bad;
-	lockinit(&smp->sm_hashlock, PVFS, "smbfsh", 0, 0);
+	lockinit(&smp->sm_hashlock, 0, "smbfsh", 0, 0);
 	smp->sm_share = ssp;
 	smp->sm_root = NULL;
         smp->sm_args = args;
diff --git a/sys/vfs/specfs/spec_vnops.c b/sys/vfs/specfs/spec_vnops.c
index a9a89e5670..d09a61f92b 100644
--- a/sys/vfs/specfs/spec_vnops.c
+++ b/sys/vfs/specfs/spec_vnops.c
@@ -32,7 +32,7 @@
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
  * $FreeBSD: src/sys/miscfs/specfs/spec_vnops.c,v 1.131.2.4 2001/02/26 04:23:20 jlemon Exp $
- * $DragonFly: src/sys/vfs/specfs/spec_vnops.c,v 1.9 2003/07/03 17:24:03 dillon Exp $
+ * $DragonFly: src/sys/vfs/specfs/spec_vnops.c,v 1.10 2003/07/19 21:14:42 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -409,7 +409,7 @@ loop2:
 	if (ap->a_waitfor == MNT_WAIT) {
 		while (vp->v_numoutput) {
 			vp->v_flag |= VBWAIT;
-			(void) tsleep((caddr_t)&vp->v_numoutput, PRIBIO + 1, "spfsyn", 0);
+			(void) tsleep((caddr_t)&vp->v_numoutput, 0, "spfsyn", 0);
 		}
 		if (!TAILQ_EMPTY(&vp->v_dirtyblkhd)) {
 			if (--maxretry != 0) {
@@ -723,7 +723,7 @@ spec_getpages(ap)
 
 	/* We definitely need to be at splbio here. */
 	while ((bp->b_flags & B_DONE) == 0) {
-		tsleep(bp, PVM, "spread", 0);
+		tsleep(bp, 0, "spread", 0);
 	}
 
 	splx(s);
diff --git a/sys/vfs/ufs/ffs_rawread.c b/sys/vfs/ufs/ffs_rawread.c
index 5819976d29..89d1c6768a 100644
--- a/sys/vfs/ufs/ffs_rawread.c
+++ b/sys/vfs/ufs/ffs_rawread.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/ufs/ffs/ffs_rawread.c,v 1.3.2.2 2003/05/29 06:15:35 alc Exp $
- * $DragonFly: src/sys/vfs/ufs/ffs_rawread.c,v 1.3 2003/06/25 03:56:11 dillon Exp $
+ * $DragonFly: src/sys/vfs/ufs/ffs_rawread.c,v 1.4 2003/07/19 21:14:51 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -124,8 +124,7 @@ ffs_rawread_sync(struct vnode *vp, struct proc *p)
 		spl = splbio();
 		while (vp->v_numoutput) {
 			vp->v_flag |= VBWAIT;
-			error = tsleep((caddr_t)&vp->v_numoutput,
-				       PRIBIO + 1,
+			error = tsleep((caddr_t)&vp->v_numoutput, 0,
 				       "rawrdfls", 0);
 			if (error != 0) {
 				splx(spl);
@@ -311,7 +310,7 @@ ffs_rawread_main(struct vnode *vp,
 		
 		spl = splbio();
 		while ((bp->b_flags & B_DONE) == 0) {
-			tsleep((caddr_t)bp, PRIBIO, "rawrd", 0);
+			tsleep((caddr_t)bp, 0, "rawrd", 0);
 		}
 		splx(spl);
 		
@@ -385,7 +384,7 @@ ffs_rawread_main(struct vnode *vp,
 	if (nbp != NULL) {			/* Run down readahead buffer */
 		spl = splbio();
 		while ((nbp->b_flags & B_DONE) == 0) {
-			tsleep((caddr_t)nbp, PRIBIO, "rawrd", 0);
+			tsleep((caddr_t)nbp, 0, "rawrd", 0);
 		}
 		splx(spl);
 		vunmapbuf(nbp);
diff --git a/sys/vfs/ufs/ffs_softdep.c b/sys/vfs/ufs/ffs_softdep.c
index 35673c796f..554ef4d401 100644
--- a/sys/vfs/ufs/ffs_softdep.c
+++ b/sys/vfs/ufs/ffs_softdep.c
@@ -37,7 +37,7 @@
  *
  *	from: @(#)ffs_softdep.c	9.59 (McKusick) 6/21/00
  * $FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.57.2.11 2002/02/05 18:46:53 dillon Exp $
- * $DragonFly: src/sys/vfs/ufs/ffs_softdep.c,v 1.8 2003/07/06 20:12:15 dillon Exp $
+ * $DragonFly: src/sys/vfs/ufs/ffs_softdep.c,v 1.9 2003/07/19 21:14:51 dillon Exp $
  */
 
 /*
@@ -787,7 +787,7 @@ softdep_flushfiles(struct mount *oldmnt, int flags, struct thread *td)
 	 */
 	while (softdep_worklist_busy != 0) {
 		softdep_worklist_req += 1;
-		tsleep(&softdep_worklist_req, PRIBIO, "softflush", 0);
+		tsleep(&softdep_worklist_req, 0, "softflush", 0);
 		softdep_worklist_req -= 1;
 	}
 	softdep_worklist_busy = -1;
@@ -1083,11 +1083,11 @@ softdep_initialize()
 		M_INODEDEP->ks_limit / (2 * sizeof(struct inodedep)));
 	pagedep_hashtbl = hashinit(desiredvnodes / 5, M_PAGEDEP,
 	    &pagedep_hash);
-	sema_init(&pagedep_in_progress, "pagedep", PRIBIO, 0);
+	sema_init(&pagedep_in_progress, "pagedep", 0, 0);
 	inodedep_hashtbl = hashinit(desiredvnodes, M_INODEDEP, &inodedep_hash);
-	sema_init(&inodedep_in_progress, "inodedep", PRIBIO, 0);
+	sema_init(&inodedep_in_progress, "inodedep", 0, 0);
 	newblk_hashtbl = hashinit(64, M_NEWBLK, &newblk_hash);
-	sema_init(&newblk_in_progress, "newblk", PRIBIO, 0);
+	sema_init(&newblk_in_progress, "newblk", 0, 0);
 }
 
 /*
@@ -4628,7 +4628,7 @@ request_cleanup(resource, islocked)
 	proc_waiting += 1;
 	if (handle.callout == NULL)
 		handle = timeout(pause_timer, 0, tickdelay > 2 ? tickdelay : 2);
-	interlocked_sleep(&lk, SLEEP, (caddr_t)&proc_waiting, PPAUSE,
+	interlocked_sleep(&lk, SLEEP, (caddr_t)&proc_waiting, 0,
 	    "softupdate", 0);
 	proc_waiting -= 1;
 	if (islocked == 0)
@@ -4870,7 +4870,7 @@ getdirtybuf(bpp, waitfor)
 			if (waitfor != MNT_WAIT)
 				return (0);
 			bp->b_xflags |= BX_BKGRDWAIT;
-			interlocked_sleep(&lk, SLEEP, &bp->b_xflags, PRIBIO,
+			interlocked_sleep(&lk, SLEEP, &bp->b_xflags, 0,
 			    "getbuf", 0);
 			continue;
 		}
@@ -4906,7 +4906,7 @@ drain_output(vp, islocked)
 	while (vp->v_numoutput) {
 		vp->v_flag |= VBWAIT;
 		interlocked_sleep(&lk, SLEEP, (caddr_t)&vp->v_numoutput,
-		    PRIBIO + 1, "drainvp", 0);
+		    0, "drainvp", 0);
 	}
 	if (!islocked)
 		FREE_LOCK(&lk);
diff --git a/sys/vfs/ufs/ffs_vfsops.c b/sys/vfs/ufs/ffs_vfsops.c
index 30675df0b8..46eb98df69 100644
--- a/sys/vfs/ufs/ffs_vfsops.c
+++ b/sys/vfs/ufs/ffs_vfsops.c
@@ -32,7 +32,7 @@
  *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
  * $FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.117.2.10 2002/06/23 22:34:52 iedowse Exp $
- * $DragonFly: src/sys/vfs/ufs/ffs_vfsops.c,v 1.7 2003/07/08 09:57:14 dillon Exp $
+ * $DragonFly: src/sys/vfs/ufs/ffs_vfsops.c,v 1.8 2003/07/19 21:14:51 dillon Exp $
  */
 
 #include "opt_quota.h"
@@ -1084,7 +1084,7 @@ restart:
 	if (ffs_inode_hash_lock) {
 		while (ffs_inode_hash_lock) {
 			ffs_inode_hash_lock = -1;
-			tsleep(&ffs_inode_hash_lock, PVM, "ffsvgt", 0);
+			tsleep(&ffs_inode_hash_lock, 0, "ffsvgt", 0);
 		}
 		goto restart;
 	}
@@ -1111,7 +1111,7 @@ restart:
 		return (error);
 	}
 	bzero((caddr_t)ip, sizeof(struct inode));
-	lockinit(&ip->i_lock, PINOD, "inode", VLKTIMEOUT, LK_CANRECURSE);
+	lockinit(&ip->i_lock, 0, "inode", VLKTIMEOUT, LK_CANRECURSE);
 	vp->v_data = ip;
 	/*
 	 * FFS supports lock sharing in the stack of vnodes
diff --git a/sys/vfs/ufs/ffs_vnops.c b/sys/vfs/ufs/ffs_vnops.c
index 52052e7701..868d4ac3c2 100644
--- a/sys/vfs/ufs/ffs_vnops.c
+++ b/sys/vfs/ufs/ffs_vnops.c
@@ -32,7 +32,7 @@
  *
  *	@(#)ffs_vnops.c	8.15 (Berkeley) 5/14/95
  * $FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.64 2000/01/10 12:04:25 phk Exp $
- * $DragonFly: src/sys/vfs/ufs/ffs_vnops.c,v 1.3 2003/06/19 01:55:08 dillon Exp $
+ * $DragonFly: src/sys/vfs/ufs/ffs_vnops.c,v 1.4 2003/07/19 21:14:51 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -240,8 +240,7 @@ loop:
 	if (wait) {
 		while (vp->v_numoutput) {
 			vp->v_flag |= VBWAIT;
-			(void) tsleep((caddr_t)&vp->v_numoutput,
-					PRIBIO + 4, "ffsfsn", 0);
+			(void) tsleep((caddr_t)&vp->v_numoutput, 0, "ffsfsn", 0);
   		}
 
 		/* 
diff --git a/sys/vfs/ufs/ufs_quota.c b/sys/vfs/ufs/ufs_quota.c
index 1f045cfed9..b17a0ee801 100644
--- a/sys/vfs/ufs/ufs_quota.c
+++ b/sys/vfs/ufs/ufs_quota.c
@@ -35,7 +35,7 @@
  *
  *	@(#)ufs_quota.c	8.5 (Berkeley) 5/20/95
  * $FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.27.2.3 2002/01/15 10:33:32 phk Exp $
- * $DragonFly: src/sys/vfs/ufs/ufs_quota.c,v 1.6 2003/07/06 21:23:55 dillon Exp $
+ * $DragonFly: src/sys/vfs/ufs/ufs_quota.c,v 1.7 2003/07/19 21:14:52 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -136,7 +136,7 @@ chkdq(ip, change, cred, flags)
 				continue;
 			while (dq->dq_flags & DQ_LOCK) {
 				dq->dq_flags |= DQ_WANT;
-				(void) tsleep((caddr_t)dq, PINOD+1, "chkdq1", 0);
+				(void) tsleep((caddr_t)dq, 0, "chkdq1", 0);
 			}
 			ncurblocks = dq->dq_curblocks + change;
 			if (ncurblocks >= 0)
@@ -162,7 +162,7 @@ chkdq(ip, change, cred, flags)
 			continue;
 		while (dq->dq_flags & DQ_LOCK) {
 			dq->dq_flags |= DQ_WANT;
-			(void) tsleep((caddr_t)dq, PINOD+1, "chkdq2", 0);
+			(void) tsleep((caddr_t)dq, 0, "chkdq2", 0);
 		}
 		/* Reset timer when crossing soft limit */
 		if (dq->dq_curblocks + change >= dq->dq_bsoftlimit &&
@@ -257,7 +257,7 @@ chkiq(ip, change, cred, flags)
 				continue;
 			while (dq->dq_flags & DQ_LOCK) {
 				dq->dq_flags |= DQ_WANT;
-				(void) tsleep((caddr_t)dq, PINOD+1, "chkiq1", 0);
+				(void) tsleep((caddr_t)dq, 0, "chkiq1", 0);
 			}
 			ncurinodes = dq->dq_curinodes + change;
 			if (ncurinodes >= 0)
@@ -283,7 +283,7 @@ chkiq(ip, change, cred, flags)
 			continue;
 		while (dq->dq_flags & DQ_LOCK) {
 			dq->dq_flags |= DQ_WANT;
-			(void) tsleep((caddr_t)dq, PINOD+1, "chkiq2", 0);
+			(void) tsleep((caddr_t)dq, 0, "chkiq2", 0);
 		}
 		/* Reset timer when crossing soft limit */
 		if (dq->dq_curinodes + change >= dq->dq_isoftlimit &&
@@ -560,7 +560,7 @@ setquota(mp, id, type, addr)
 	dq = ndq;
 	while (dq->dq_flags & DQ_LOCK) {
 		dq->dq_flags |= DQ_WANT;
-		(void) tsleep((caddr_t)dq, PINOD+1, "setqta", 0);
+		(void) tsleep((caddr_t)dq, 0, "setqta", 0);
 	}
 	/*
 	 * Copy all but the current values.
@@ -621,7 +621,7 @@ setuse(mp, id, type, addr)
 	dq = ndq;
 	while (dq->dq_flags & DQ_LOCK) {
 		dq->dq_flags |= DQ_WANT;
-		(void) tsleep((caddr_t)dq, PINOD+1, "setuse", 0);
+		(void) tsleep((caddr_t)dq, 0, "setuse", 0);
 	}
 	/*
 	 * Reset time limit if have a soft limit and were
@@ -908,7 +908,7 @@ dqsync(struct vnode *vp, struct dquot *dq)
 		vn_lock(dqvp, LK_EXCLUSIVE | LK_RETRY, td);
 	while (dq->dq_flags & DQ_LOCK) {
 		dq->dq_flags |= DQ_WANT;
-		(void) tsleep((caddr_t)dq, PINOD+2, "dqsync", 0);
+		(void) tsleep((caddr_t)dq, 0, "dqsync", 0);
 		if ((dq->dq_flags & DQ_MOD) == 0) {
 			if (vp != dqvp)
 				VOP_UNLOCK(dqvp, 0, td);
diff --git a/sys/vfs/union/union_subr.c b/sys/vfs/union/union_subr.c
index 9f15b0a60e..1dd768a50a 100644
--- a/sys/vfs/union/union_subr.c
+++ b/sys/vfs/union/union_subr.c
@@ -36,7 +36,7 @@
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
  * $FreeBSD: src/sys/miscfs/union/union_subr.c,v 1.43.2.2 2001/12/25 01:44:45 dillon Exp $
- * $DragonFly: src/sys/vfs/union/union_subr.c,v 1.4 2003/06/26 05:55:16 dillon Exp $
+ * $DragonFly: src/sys/vfs/union/union_subr.c,v 1.5 2003/07/19 21:14:43 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -108,7 +108,7 @@ union_list_lock(ix)
 {
 	if (unvplock[ix] & UNVP_LOCKED) {
 		unvplock[ix] |= UNVP_WANT;
-		(void) tsleep((caddr_t) &unvplock[ix], PINOD, "unllck", 0);
+		(void) tsleep((caddr_t) &unvplock[ix], 0, "unllck", 0);
 		return (1);
 	}
 	unvplock[ix] |= UNVP_LOCKED;
@@ -566,7 +566,7 @@ loop:
 	un = VTOUNION(*vpp);
 	bzero(un, sizeof(*un));
 
-	lockinit(&un->un_lock, PVFS, "unlock", VLKTIMEOUT, 0);
+	lockinit(&un->un_lock, 0, "unlock", VLKTIMEOUT, 0);
 	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td);
 
 	un->un_vnode = *vpp;
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index f32d8baf74..b78afbd1f4 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -37,7 +37,7 @@
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
  * $FreeBSD: src/sys/vm/device_pager.c,v 1.46.2.1 2000/08/02 21:54:37 peter Exp $
- * $DragonFly: src/sys/vm/device_pager.c,v 1.2 2003/06/17 04:29:00 dillon Exp $
+ * $DragonFly: src/sys/vm/device_pager.c,v 1.3 2003/07/19 21:14:53 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -133,7 +133,7 @@ dev_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot, vm_ooffset_t fo
 	 */
 	while (dev_pager_alloc_lock) {
 		dev_pager_alloc_lock_want++;
-		tsleep(&dev_pager_alloc_lock, PVM, "dvpall", 0);
+		tsleep(&dev_pager_alloc_lock, 0, "dvpall", 0);
 		dev_pager_alloc_lock_want--;
 	}
 	dev_pager_alloc_lock = 1;
diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c
index eac8354e34..ceba0cee70 100644
--- a/sys/vm/phys_pager.c
+++ b/sys/vm/phys_pager.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/vm/phys_pager.c,v 1.3.2.3 2000/12/17 02:05:41 alfred Exp $
- * $DragonFly: src/sys/vm/phys_pager.c,v 1.2 2003/06/17 04:29:00 dillon Exp $
+ * $DragonFly: src/sys/vm/phys_pager.c,v 1.3 2003/07/19 21:14:53 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -71,7 +71,7 @@ phys_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot,
 		 */
 		while (phys_pager_alloc_lock) {
 			phys_pager_alloc_lock_want++;
-			tsleep(&phys_pager_alloc_lock, PVM, "ppall", 0);
+			tsleep(&phys_pager_alloc_lock, 0, "ppall", 0);
 			phys_pager_alloc_lock_want--;
 		}
 		phys_pager_alloc_lock = 1;
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 4f0f2e3502..670cac5d69 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -65,7 +65,7 @@
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
  *
  * $FreeBSD: src/sys/vm/swap_pager.c,v 1.130.2.12 2002/08/31 21:15:55 dillon Exp $
- * $DragonFly: src/sys/vm/swap_pager.c,v 1.7 2003/07/03 17:24:04 dillon Exp $
+ * $DragonFly: src/sys/vm/swap_pager.c,v 1.8 2003/07/19 21:14:53 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -385,7 +385,7 @@ swap_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot,
 
 		while (sw_alloc_interlock) {
 			sw_alloc_interlock = -1;
-			tsleep(&sw_alloc_interlock, PVM, "swpalc", 0);
+			tsleep(&sw_alloc_interlock, 0, "swpalc", 0);
 		}
 		sw_alloc_interlock = 1;
 
@@ -1166,7 +1166,7 @@ swap_pager_getpages(object, m, count, reqpage)
 	while ((mreq->flags & PG_SWAPINPROG) != 0) {
 		vm_page_flag_set(mreq, PG_WANTED | PG_REFERENCED);
 		mycpu->gd_cnt.v_intrans++;
-		if (tsleep(mreq, PSWP, "swread", hz*20)) {
+		if (tsleep(mreq, 0, "swread", hz*20)) {
 			printf(
 			    "swap_pager: indefinite wait buffer: device:"
 				" %s, blkno: %ld, size: %ld\n",
@@ -1425,7 +1425,7 @@ swap_pager_putpages(object, m, count, sync, rtvals)
 		s = splbio();
 
 		while ((bp->b_flags & B_DONE) == 0) {
-			tsleep(bp, PVM, "swwrt", 0);
+			tsleep(bp, 0, "swwrt", 0);
 		}
 
 		for (j = 0; j < n; ++j)
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index 54404cf96f..20d2b9f218 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -60,7 +60,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm.h,v 1.16.2.1 2002/12/28 19:49:41 dillon Exp $
- * $DragonFly: src/sys/vm/vm.h,v 1.2 2003/06/17 04:29:00 dillon Exp $
+ * $DragonFly: src/sys/vm/vm.h,v 1.3 2003/07/19 21:14:53 dillon Exp $
  */
 
 #ifndef VM_H
@@ -97,6 +97,9 @@ typedef struct vm_map *vm_map_t;
 struct vm_object;
 typedef struct vm_object *vm_object_t;
 
+struct vm_object_lock;
+typedef struct vm_object_lock *vm_object_lock_t;
+
 #ifndef _KERNEL
 /*
  * This is defined in <sys/types.h> for the kernel so that non-vm kernel
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index a730668964..fa29187f6b 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -60,7 +60,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_glue.c,v 1.94.2.4 2003/01/13 22:51:17 dillon Exp $
- * $DragonFly: src/sys/vm/vm_glue.c,v 1.12 2003/07/11 23:26:20 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_glue.c,v 1.13 2003/07/19 21:14:53 dillon Exp $
  */
 
 #include "opt_vm.h"
@@ -394,7 +394,7 @@ loop:
 	 * Nothing to do, back to sleep.
 	 */
 	if ((p = pp) == NULL) {
-		tsleep(&proc0, PVM, "sched", 0);
+		tsleep(&proc0, 0, "sched", 0);
 		goto loop;
 	}
 	p->p_flag &= ~P_SWAPINREQ;
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index dee333c141..428883f519 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -62,7 +62,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_kern.c,v 1.61.2.2 2002/03/12 18:25:26 tegge Exp $
- * $DragonFly: src/sys/vm/vm_kern.c,v 1.3 2003/06/21 07:54:57 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_kern.c,v 1.4 2003/07/19 21:14:53 dillon Exp $
  */
 
 /*
@@ -449,7 +449,7 @@ kmem_alloc_wait(map, size)
 			return (0);
 		}
 		vm_map_unlock(map);
-		tsleep(map, PVM, "kmaw", 0);
+		tsleep(map, 0, "kmaw", 0);
 	}
 	vm_map_insert(map, NULL, (vm_offset_t) 0, addr, addr + size, VM_PROT_ALL, VM_PROT_ALL, 0);
 	vm_map_unlock(map);
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 1b3b614fcb..68080cc448 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -62,7 +62,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_map.c,v 1.187.2.19 2003/05/27 00:47:02 alc Exp $
- * $DragonFly: src/sys/vm/vm_map.c,v 1.5 2003/07/06 21:23:56 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_map.c,v 1.6 2003/07/19 21:14:53 dillon Exp $
  */
 
 /*
@@ -323,7 +323,7 @@ vm_map_init(map, min, max)
 	map->first_free = &map->header;
 	map->hint = &map->header;
 	map->timestamp = 0;
-	lockinit(&map->lock, PVM, "thrd_sleep", 0, LK_NOPAUSE);
+	lockinit(&map->lock, 0, "thrd_sleep", 0, LK_NOPAUSE);
 }
 
 /*
@@ -983,7 +983,7 @@ void
 vm_map_transition_wait(vm_map_t map)
 {
 	vm_map_unlock(map);
-	tsleep(map, PVM, "vment", 0);
+	tsleep(map, 0, "vment", 0);
 	vm_map_lock(map);
 }
 
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 3dba04dfe3..05516e3d1c 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -32,7 +32,7 @@
  *
  *	@(#)vm_meter.c	8.4 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/vm/vm_meter.c,v 1.34.2.7 2002/10/10 19:28:22 dillon Exp $
- * $DragonFly: src/sys/vm/vm_meter.c,v 1.6 2003/07/12 16:55:54 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_meter.c,v 1.7 2003/07/19 21:14:53 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -108,8 +108,7 @@ do_vmtotal(SYSCTL_HANDLER_ARGS)
 		case SSLEEP:
 		case SSTOP:
 			if (p->p_flag & P_INMEM) {
-				/* YYY p_priority */
-				if (p->p_priority <= PZERO)
+				if ((p->p_flag & P_SINTR) == 0)
 					totalp->t_dw++;
 				else if (p->p_slptime < maxslp)
 					totalp->t_sl++;
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index b8c3979e1b..d882e50249 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -62,7 +62,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_object.h,v 1.63.2.3 2003/05/26 19:17:56 alc Exp $
- * $DragonFly: src/sys/vm/vm_object.h,v 1.2 2003/06/17 04:29:00 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_object.h,v 1.3 2003/07/19 21:14:53 dillon Exp $
  */
 
 /*
@@ -80,12 +80,24 @@ enum obj_type { OBJT_DEFAULT, OBJT_SWAP, OBJT_VNODE, OBJT_DEVICE, OBJT_PHYS,
 typedef u_char objtype_t;
 
 /*
- *	Types defined:
- *
- *	vm_object_t		Virtual memory object.
+ * vm_object_lock	A lock covering byte ranges within a VM object
  *
  */
+struct vm_object_lock {
+	struct vm_object_lock *next;
+	int	type;			/* type of lock */
+	int	waiting;		/* someone is waiting on the lock */
+	off_t	base;			/* byte offset into object */
+	off_t	bytes;			/* extent in bytes */
+};
+
+#define VMOBJ_LOCK_SHARED	1
+#define VMOBJ_LOCK_EXCL		2
 
+/*
+ * vm_object		A VM object which represents an arbitrarily sized
+ *			data store.
+ */
 struct vm_object {
 	TAILQ_ENTRY(vm_object) object_list; /* list of all objects */
 	LIST_HEAD(, vm_object) shadow_head; /* objects that this is a shadow for */
@@ -105,6 +117,7 @@ struct vm_object {
 	vm_ooffset_t backing_object_offset;/* Offset in backing object */
 	TAILQ_ENTRY(vm_object) pager_object_list; /* list of all objects of this pager type */
 	void *handle;
+	vm_object_lock_t range_locks;
 	union {
 		/*
 		 * VNode pager
@@ -224,7 +237,7 @@ vm_object_pip_sleep(vm_object_t object, char *waitid)
 		int s = splvm();
 		if (object->paging_in_progress) {
 			vm_object_set_flag(object, OBJ_PIPWNT);
-			tsleep(object, PVM, waitid, 0);
+			tsleep(object, 0, waitid, 0);
 		}
 		splx(s);
 	}
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 1d8b7fbd1c..b69f7960ea 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)vm_page.c	7.4 (Berkeley) 5/7/91
  * $FreeBSD: src/sys/vm/vm_page.c,v 1.147.2.18 2002/03/10 05:03:19 alc Exp $
- * $DragonFly: src/sys/vm/vm_page.c,v 1.6 2003/07/03 17:24:04 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_page.c,v 1.7 2003/07/19 21:14:53 dillon Exp $
  */
 
 /*
@@ -872,13 +872,13 @@ vm_wait(void)
 	s = splvm();
 	if (curthread == pagethread) {
 		vm_pageout_pages_needed = 1;
-		tsleep(&vm_pageout_pages_needed, PSWP, "VMWait", 0);
+		tsleep(&vm_pageout_pages_needed, 0, "VMWait", 0);
 	} else {
 		if (!vm_pages_needed) {
 			vm_pages_needed = 1;
 			wakeup(&vm_pages_needed);
 		}
-		tsleep(&vmstats.v_free_count, PVM, "vmwait", 0);
+		tsleep(&vmstats.v_free_count, 0, "vmwait", 0);
 	}
 	splx(s);
 }
@@ -904,7 +904,7 @@ vm_waitpfault(void)
 		vm_pages_needed = 1;
 		wakeup(&vm_pages_needed);
 	}
-	tsleep(&vmstats.v_free_count, PUSER, "pfault", 0);
+	tsleep(&vmstats.v_free_count, 0, "pfault", 0);
 	splx(s);
 }
 
@@ -1435,7 +1435,7 @@ retrylookup:
 			while ((object->generation == generation) &&
 					(m->busy || (m->flags & PG_BUSY))) {
 				vm_page_flag_set(m, PG_WANTED | PG_REFERENCED);
-				tsleep(m, PVM, "pgrbwt", 0);
+				tsleep(m, 0, "pgrbwt", 0);
 				if ((allocflags & VM_ALLOC_RETRY) == 0) {
 					splx(s);
 					return NULL;
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 5edb94ae90..3f50e08ce2 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -62,7 +62,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_page.h,v 1.75.2.8 2002/03/06 01:07:09 dillon Exp $
- * $DragonFly: src/sys/vm/vm_page.h,v 1.3 2003/06/21 07:54:57 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_page.h,v 1.4 2003/07/19 21:14:53 dillon Exp $
  */
 
 /*
@@ -550,7 +550,7 @@ vm_page_sleep_busy(vm_page_t m, int also_m_busy, const char *msg)
 			 * Page is busy. Wait and retry.
 			 */
 			vm_page_flag_set(m, PG_WANTED | PG_REFERENCED);
-			tsleep(m, PVM, msg, 0);
+			tsleep(m, 0, msg, 0);
 		}
 		splx(s);
 		return(TRUE);
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index d5ed1bbe1c..964a7a12c7 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -66,7 +66,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_pageout.c,v 1.151.2.15 2002/12/29 18:21:04 dillon Exp $
- * $DragonFly: src/sys/vm/vm_pageout.c,v 1.5 2003/07/03 17:24:04 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_pageout.c,v 1.6 2003/07/19 21:14:53 dillon Exp $
  */
 
 /*
@@ -1381,7 +1381,7 @@ vm_pageout()
 			 */
 			++pass;
 			if (pass > 1)
-				tsleep(&vm_pages_needed, PVM, "psleep", hz/2);
+				tsleep(&vm_pages_needed, 0, "psleep", hz/2);
 		} else {
 			/*
 			 * Good enough, sleep & handle stats.  Prime the pass
@@ -1392,7 +1392,7 @@ vm_pageout()
 			else
 				pass = 0;
 			error = tsleep(&vm_pages_needed,
-				PVM, "psleep", vm_pageout_stats_interval * hz);
+				0, "psleep", vm_pageout_stats_interval * hz);
 			if (error && !vm_pages_needed) {
 				splx(s);
 				pass = 0;
@@ -1436,7 +1436,7 @@ vm_daemon()
 	struct proc *p;
 
 	while (TRUE) {
-		tsleep(&vm_daemon_needed, PPAUSE, "psleep", 0);
+		tsleep(&vm_daemon_needed, 0, "psleep", 0);
 		if (vm_pageout_req_swapout) {
 			swapout_procs(vm_pageout_req_swapout);
 			vm_pageout_req_swapout = 0;
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 61ca0d89e4..d909fc653d 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -62,7 +62,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_pager.c,v 1.54.2.2 2001/11/18 07:11:00 dillon Exp $
- * $DragonFly: src/sys/vm/vm_pager.c,v 1.5 2003/06/26 05:55:21 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_pager.c,v 1.6 2003/07/19 21:14:53 dillon Exp $
  */
 
 /*
@@ -381,7 +381,7 @@ getpbuf(pfreecnt)
 	for (;;) {
 		if (pfreecnt) {
 			while (*pfreecnt == 0) {
-				tsleep(pfreecnt, PVM, "wswbuf0", 0);
+				tsleep(pfreecnt, 0, "wswbuf0", 0);
 			}
 		}
 
@@ -390,7 +390,7 @@ getpbuf(pfreecnt)
 			break;
 
 		bswneeded = 1;
-		tsleep(&bswneeded, PVM, "wswbuf1", 0);
+		tsleep(&bswneeded, 0, "wswbuf1", 0);
 		/* loop in case someone else grabbed one */
 	}
 	TAILQ_REMOVE(&bswlist, bp, b_freelist);
@@ -569,7 +569,7 @@ waitchainbuf(struct buf *bp, int count, int done)
 	s = splbio();
 	while (bp->b_chain.count > count) {
 		bp->b_flags |= B_WANT;
-		tsleep(bp, PRIBIO + 4, "bpchain", 0);
+		tsleep(bp, 0, "bpchain", 0);
 	}
 	if (done) {
 		if (bp->b_resid != 0 && !(bp->b_flags & B_ERROR)) {
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index d3de6114cf..cd6402a988 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -39,7 +39,7 @@
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
  * $FreeBSD: src/sys/vm/vnode_pager.c,v 1.116.2.7 2002/12/31 09:34:51 dillon Exp $
- * $DragonFly: src/sys/vm/vnode_pager.c,v 1.7 2003/07/06 21:23:56 dillon Exp $
+ * $DragonFly: src/sys/vm/vnode_pager.c,v 1.8 2003/07/19 21:14:53 dillon Exp $
  */
 
 /*
@@ -123,7 +123,7 @@ vnode_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot,
 	 */
 	while (vp->v_flag & VOLOCK) {
 		vp->v_flag |= VOWANT;
-		tsleep(vp, PVM, "vnpobj", 0);
+		tsleep(vp, 0, "vnpobj", 0);
 	}
 	vp->v_flag |= VOLOCK;
 
@@ -133,7 +133,7 @@ vnode_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot,
 	 */
 	while (((object = vp->v_object) != NULL) &&
 		(object->flags & OBJ_DEAD)) {
-		tsleep(object, PVM, "vadead", 0);
+		tsleep(object, 0, "vadead", 0);
 	}
 
 	if (vp->v_usecount == 0)
@@ -474,7 +474,7 @@ vnode_pager_input_smlfs(object, m)
 
 			s = splvm();
 			while ((bp->b_flags & B_DONE) == 0) {
-				tsleep(bp, PVM, "vnsrd", 0);
+				tsleep(bp, 0, "vnsrd", 0);
 			}
 			splx(s);
 			if ((bp->b_flags & B_ERROR) != 0)
@@ -792,7 +792,7 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
 	/* we definitely need to be at splvm here */
 
 	while ((bp->b_flags & B_DONE) == 0) {
-		tsleep(bp, PVM, "vnread", 0);
+		tsleep(bp, 0, "vnread", 0);
 	}
 	splx(s);
 	if ((bp->b_flags & B_ERROR) != 0)