diff options
| author | thorpej <thorpej@NetBSD.org> | 2003-01-18 10:14:20 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2003-01-18 10:14:20 +0000 |
| commit | af919042eceb8c19f42acd688efa8cf58168af5d (patch) | |
| tree | 5be03e45b593edbeaba5f135ac2a2dc1cd42447b /sys/dev | |
| parent | 6f2d376f48d48514b16b5087c7c5b9f817ac0b0e (diff) | |
Merge the nathanw_sa branch.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/awi.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/dpt.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/i82365.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/rrunner.c | 18 |
4 files changed, 20 insertions, 18 deletions
diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c index 597c9fcfda0..36ca0dae119 100644 --- a/sys/dev/ic/awi.c +++ b/sys/dev/ic/awi.c @@ -1,4 +1,4 @@ -/* $NetBSD: awi.c,v 1.50 2002/10/01 03:27:04 onoe Exp $ */ +/* $NetBSD: awi.c,v 1.51 2003/01/18 10:14:20 thorpej Exp $ */ /*- * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc. @@ -85,7 +85,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.50 2002/10/01 03:27:04 onoe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.51 2003/01/18 10:14:20 thorpej Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -1616,7 +1616,7 @@ awi_lock(struct awi_softc *sc) { int error = 0; - if (curproc == NULL) { + if (curlwp == NULL) { /* * XXX * Though driver ioctl should be called with context, diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c index bd0cc73a0d7..de95ebf3bc6 100644 --- a/sys/dev/ic/dpt.c +++ b/sys/dev/ic/dpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: dpt.c,v 1.35 2002/12/10 20:06:43 fvdl Exp $ */ +/* $NetBSD: dpt.c,v 1.36 2003/01/18 10:14:20 thorpej Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.35 2002/12/10 20:06:43 fvdl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.36 2003/01/18 10:14:20 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1332,7 +1332,7 @@ dpt_passthrough(struct dpt_softc *sc, struct eata_ucp *ucp, struct proc *proc) /* * Start the command and sleep on completion. */ - PHOLD(proc); + PHOLD(curlwp); /* XXXJRT curlwp */ bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, CCB_OFF(sc, ccb), sizeof(struct dpt_ccb), BUS_DMASYNC_PREWRITE); s = splbio(); @@ -1342,7 +1342,7 @@ dpt_passthrough(struct dpt_softc *sc, struct eata_ucp *ucp, struct proc *proc) panic("%s: dpt_cmd failed", sc->sc_dv.dv_xname); tsleep(ccb, PWAIT, "dptucmd", 0); splx(s); - PRELE(proc); + PRELE(curlwp); /* XXXJRT curlwp */ /* * Sync up the DMA map and copy out results. diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c index db781e63040..5e2d1cf0d26 100644 --- a/sys/dev/ic/i82365.c +++ b/sys/dev/ic/i82365.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82365.c,v 1.70 2003/01/01 00:10:18 thorpej Exp $ */ +/* $NetBSD: i82365.c,v 1.71 2003/01/18 10:14:21 thorpej Exp $ */ /* * Copyright (c) 2000 Christian E. Hopps. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.70 2003/01/01 00:10:18 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.71 2003/01/18 10:14:21 thorpej Exp $"); #define PCICDEBUG @@ -1389,7 +1389,7 @@ pcic_delay(h, timo, wmesg) printf("called with timeout %d\n", timo); panic("pcic_delay"); } - if (curproc == NULL) { + if (curlwp == NULL) { printf("called in interrupt context\n"); panic("pcic_delay"); } diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c index 1e6a7bbaf27..c44e49a170c 100644 --- a/sys/dev/ic/rrunner.c +++ b/sys/dev/ic/rrunner.c @@ -1,4 +1,4 @@ -/* $NetBSD: rrunner.c,v 1.35 2003/01/06 20:30:36 wiz Exp $ */ +/* $NetBSD: rrunner.c,v 1.36 2003/01/18 10:14:22 thorpej Exp $ */ /* * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.35 2003/01/06 20:30:36 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.36 2003/01/18 10:14:22 thorpej Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -1008,7 +1008,8 @@ esh_fpread(dev, uio, ioflag) struct uio *uio; int ioflag; { - struct proc *p = curproc; + struct lwp *l = curlwp; + struct proc *p = l->l_proc; struct iovec *iovp; struct esh_softc *sc; struct esh_fp_ring_ctl *ring; @@ -1046,7 +1047,7 @@ esh_fpread(dev, uio, ioflag) } } - PHOLD(p); /* Lock process info into memory */ + PHOLD(l); /* Lock process info into memory */ /* Lock down the pages */ for (i = 0; i < uio->uio_iovcnt; i++) { @@ -1150,7 +1151,7 @@ esh_fpread(dev, uio, ioflag) uvm_vsunlock(p, iovp->iov_base, iovp->iov_len); } - PRELE(p); /* Release process info */ + PRELE(l); /* Release process info */ esh_free_dmainfo(sc, di); fpread_done: @@ -1168,7 +1169,8 @@ esh_fpwrite(dev, uio, ioflag) struct uio *uio; int ioflag; { - struct proc *p = curproc; + struct lwp *l = curlwp; + struct proc *p = l->l_proc; struct iovec *iovp; struct esh_softc *sc; struct esh_send_ring_ctl *ring; @@ -1206,7 +1208,7 @@ esh_fpwrite(dev, uio, ioflag) } } - PHOLD(p); /* Lock process info into memory */ + PHOLD(l); /* Lock process info into memory */ /* Lock down the pages */ for (i = 0; i < uio->uio_iovcnt; i++) { @@ -1306,7 +1308,7 @@ esh_fpwrite(dev, uio, ioflag) uvm_vsunlock(p, iovp->iov_base, iovp->iov_len); } - PRELE(p); /* Release process info */ + PRELE(l); /* Release process info */ esh_free_dmainfo(sc, di); fpwrite_done: |
