summaryrefslogtreecommitdiff
path: root/sys/arch/hp300
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2002-06-09 05:23:30 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2002-06-09 05:23:30 +0000
commit156e1f5ebb7cd20a62a574d6bd69f3f00fb02c02 (patch)
treef2583a20d1408b5a1665a1bae0dc5360e840815e /sys/arch/hp300
parentcc8e8b767951687f89ee94d3a5f12c70a1aa43a6 (diff)
convert sleep() calls to tsleep().
Diffstat (limited to 'sys/arch/hp300')
-rw-r--r--sys/arch/hp300/dev/hd.c6
-rw-r--r--sys/arch/hp300/dev/ppi.c4
-rw-r--r--sys/arch/hp300/dev/sd.c6
-rw-r--r--sys/arch/hp300/dev/st.c4
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index b667b0e1663..0470eb8baf2 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hd.c,v 1.17 2002/06/09 02:11:47 jsyn Exp $ */
+/* $OpenBSD: hd.c,v 1.18 2002/06/09 05:23:26 miod Exp $ */
/* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */
/*
@@ -560,7 +560,7 @@ hdopen(dev, flags, mode, p)
* Wait for any pending opens/closes to complete
*/
while (rs->sc_flags & (HDF_OPENING|HDF_CLOSING))
- sleep((caddr_t)rs, PRIBIO);
+ tsleep((caddr_t)rs, PRIBIO, "hdopen", 0);
/*
* On first open, get label and partition info.
@@ -629,7 +629,7 @@ hdclose(dev, flag, mode, p)
s = splbio();
while (rs->sc_tab.b_active) {
rs->sc_flags |= HDF_WANTED;
- sleep((caddr_t)&rs->sc_tab, PRIBIO);
+ tsleep((caddr_t)&rs->sc_tab, PRIBIO, "hdclose", 0);
}
splx(s);
rs->sc_flags &= ~(HDF_CLOSING);
diff --git a/sys/arch/hp300/dev/ppi.c b/sys/arch/hp300/dev/ppi.c
index 720f80e5292..ca30436f61f 100644
--- a/sys/arch/hp300/dev/ppi.c
+++ b/sys/arch/hp300/dev/ppi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppi.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: ppi.c,v 1.10 2002/06/09 05:23:26 miod Exp $ */
/* $NetBSD: ppi.c,v 1.13 1997/04/02 22:37:33 scottr Exp $ */
/*
@@ -315,7 +315,7 @@ again:
s = splbio();
if ((sc->sc_flags & PPIF_UIO) &&
hpibreq(sc->sc_dev.dv_parent, &sc->sc_hq) == 0)
- sleep(sc, PRIBIO+1);
+ tsleep(sc, PRIBIO+1, "ppirw", 0);
/*
* Check if we timed out during sleep or uiomove
*/
diff --git a/sys/arch/hp300/dev/sd.c b/sys/arch/hp300/dev/sd.c
index f4181738062..9559703022d 100644
--- a/sys/arch/hp300/dev/sd.c
+++ b/sys/arch/hp300/dev/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.25 2002/05/30 11:03:52 art Exp $ */
+/* $OpenBSD: sd.c,v 1.26 2002/06/09 05:23:26 miod Exp $ */
/* $NetBSD: sd.c,v 1.34 1997/07/10 18:14:10 kleink Exp $ */
/*
@@ -537,7 +537,7 @@ sdopen(dev, flags, mode, p)
* Wait for any pending opens/closes to complete
*/
while (sc->sc_flags & (SDF_OPENING|SDF_CLOSING))
- sleep((caddr_t)sc, PRIBIO);
+ tsleep((caddr_t)sc, PRIBIO, "sdopen", 0);
/*
* On first open, get label and partition info.
@@ -606,7 +606,7 @@ sdclose(dev, flag, mode, p)
s = splbio();
while (sc->sc_tab.b_active) {
sc->sc_flags |= SDF_WANTED;
- sleep((caddr_t)&sc->sc_tab, PRIBIO);
+ tsleep((caddr_t)&sc->sc_tab, PRIBIO, "sdclose", 0);
}
splx(s);
sc->sc_flags &= ~(SDF_CLOSING|SDF_ERROR);
diff --git a/sys/arch/hp300/dev/st.c b/sys/arch/hp300/dev/st.c
index eb0605196e2..8f02d741249 100644
--- a/sys/arch/hp300/dev/st.c
+++ b/sys/arch/hp300/dev/st.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: st.c,v 1.13 2002/05/23 15:31:57 art Exp $ */
+/* $OpenBSD: st.c,v 1.14 2002/06/09 05:23:26 miod Exp $ */
/* $NetBSD: st.c,v 1.22 1997/04/02 22:37:38 scottr Exp $ */
/*
@@ -1180,7 +1180,7 @@ again:
if (bp->b_flags & B_DONE)
break;
bp->b_flags |= B_WANTED;
- sleep((caddr_t)bp, PRIBIO);
+ tsleep((caddr_t)bp, PRIBIO, "stcommand", 0);
}
bp->b_flags = B_BUSY|B_READ;
splx(s);