diff options
| author | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
| commit | 95e1ffb15694e54f29f8baaa4232152b703c2a5a (patch) | |
| tree | d6510e195bc06092a8057e34c6442eba4e77d09a /sys/dev/ata | |
| parent | 4f17ba81bcaf3f5086d88a346cbfd12506a5e3e6 (diff) | |
merge ktrace-lwp.
Diffstat (limited to 'sys/dev/ata')
| -rw-r--r-- | sys/dev/ata/Makefile | 2 | ||||
| -rw-r--r-- | sys/dev/ata/ata.c | 10 | ||||
| -rw-r--r-- | sys/dev/ata/ata_raid.c | 4 | ||||
| -rw-r--r-- | sys/dev/ata/ata_raid_adaptec.c | 4 | ||||
| -rw-r--r-- | sys/dev/ata/ata_raid_promise.c | 4 | ||||
| -rw-r--r-- | sys/dev/ata/ata_raidreg.h | 2 | ||||
| -rw-r--r-- | sys/dev/ata/ata_raidvar.h | 2 | ||||
| -rw-r--r-- | sys/dev/ata/ata_wdc.c | 4 | ||||
| -rw-r--r-- | sys/dev/ata/atareg.h | 2 | ||||
| -rw-r--r-- | sys/dev/ata/atavar.h | 2 | ||||
| -rw-r--r-- | sys/dev/ata/files.ata | 2 | ||||
| -rw-r--r-- | sys/dev/ata/ld_ataraid.c | 6 | ||||
| -rw-r--r-- | sys/dev/ata/sata_subr.c | 2 | ||||
| -rw-r--r-- | sys/dev/ata/satapmpreg.h | 2 | ||||
| -rw-r--r-- | sys/dev/ata/satareg.h | 2 | ||||
| -rw-r--r-- | sys/dev/ata/satavar.h | 2 | ||||
| -rw-r--r-- | sys/dev/ata/wd.c | 18 | ||||
| -rw-r--r-- | sys/dev/ata/wdvar.h | 2 |
18 files changed, 36 insertions, 36 deletions
diff --git a/sys/dev/ata/Makefile b/sys/dev/ata/Makefile index 00fe60cfa01..709805f4f47 100644 --- a/sys/dev/ata/Makefile +++ b/sys/dev/ata/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/12/14 17:14:47 thorpej Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/11 12:21:14 christos Exp $ INCSDIR= /usr/include/dev/ata diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c index 1a6b6127b1d..64185dfb67b 100644 --- a/sys/dev/ata/ata.c +++ b/sys/dev/ata/ata.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata.c,v 1.71 2005/07/07 17:51:31 drochner Exp $ */ +/* $NetBSD: ata.c,v 1.72 2005/12/11 12:21:14 christos Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.71 2005/07/07 17:51:31 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.72 2005/12/11 12:21:14 christos Exp $"); #ifndef ATADEBUG #define ATADEBUG @@ -1318,7 +1318,7 @@ ata_probe_caps(struct ata_drive_datas *drvp) /* management of the /dev/atabus* devices */ int -atabusopen(dev_t dev, int flag, int fmt, struct proc *p) +atabusopen(dev_t dev, int flag, int fmt, struct lwp *l) { struct atabus_softc *sc; int error, unit = minor(dev); @@ -1340,7 +1340,7 @@ atabusopen(dev_t dev, int flag, int fmt, struct proc *p) int -atabusclose(dev_t dev, int flag, int fmt, struct proc *p) +atabusclose(dev_t dev, int flag, int fmt, struct lwp *l) { struct atabus_softc *sc = atabus_cd.cd_devs[minor(dev)]; @@ -1352,7 +1352,7 @@ atabusclose(dev_t dev, int flag, int fmt, struct proc *p) } int -atabusioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) +atabusioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l) { struct atabus_softc *sc = atabus_cd.cd_devs[minor(dev)]; struct ata_channel *chp = sc->sc_chan; diff --git a/sys/dev/ata/ata_raid.c b/sys/dev/ata/ata_raid.c index e01baa56699..2f3a63a7798 100644 --- a/sys/dev/ata/ata_raid.c +++ b/sys/dev/ata/ata_raid.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata_raid.c,v 1.16 2005/08/25 22:33:18 drochner Exp $ */ +/* $NetBSD: ata_raid.c,v 1.17 2005/12/11 12:21:14 christos Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.16 2005/08/25 22:33:18 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.17 2005/12/11 12:21:14 christos Exp $"); #include <sys/param.h> #include <sys/buf.h> diff --git a/sys/dev/ata/ata_raid_adaptec.c b/sys/dev/ata/ata_raid_adaptec.c index 487af18bee2..f3b0fab9292 100644 --- a/sys/dev/ata/ata_raid_adaptec.c +++ b/sys/dev/ata/ata_raid_adaptec.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata_raid_adaptec.c,v 1.1 2005/06/20 02:11:57 briggs Exp $ */ +/* $NetBSD: ata_raid_adaptec.c,v 1.2 2005/12/11 12:21:14 christos Exp $ */ /*- * Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org> @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ata_raid_adaptec.c,v 1.1 2005/06/20 02:11:57 briggs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata_raid_adaptec.c,v 1.2 2005/12/11 12:21:14 christos Exp $"); #include <sys/param.h> #include <sys/buf.h> diff --git a/sys/dev/ata/ata_raid_promise.c b/sys/dev/ata/ata_raid_promise.c index b871c0132f4..af17319b522 100644 --- a/sys/dev/ata/ata_raid_promise.c +++ b/sys/dev/ata/ata_raid_promise.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata_raid_promise.c,v 1.5 2005/02/27 00:26:58 perry Exp $ */ +/* $NetBSD: ata_raid_promise.c,v 1.6 2005/12/11 12:21:14 christos Exp $ */ /*- * Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org> @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ata_raid_promise.c,v 1.5 2005/02/27 00:26:58 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata_raid_promise.c,v 1.6 2005/12/11 12:21:14 christos Exp $"); #include <sys/param.h> #include <sys/buf.h> diff --git a/sys/dev/ata/ata_raidreg.h b/sys/dev/ata/ata_raidreg.h index 5466529447e..c88be7db7ea 100644 --- a/sys/dev/ata/ata_raidreg.h +++ b/sys/dev/ata/ata_raidreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ata_raidreg.h,v 1.2 2005/06/20 02:11:57 briggs Exp $ */ +/* $NetBSD: ata_raidreg.h,v 1.3 2005/12/11 12:21:14 christos Exp $ */ /*- * Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org> diff --git a/sys/dev/ata/ata_raidvar.h b/sys/dev/ata/ata_raidvar.h index 90b68882d0f..6ffd4ed5baa 100644 --- a/sys/dev/ata/ata_raidvar.h +++ b/sys/dev/ata/ata_raidvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ata_raidvar.h,v 1.3 2005/07/18 15:21:48 briggs Exp $ */ +/* $NetBSD: ata_raidvar.h,v 1.4 2005/12/11 12:21:14 christos Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c index 360625ef1b2..0762dbc7507 100644 --- a/sys/dev/ata/ata_wdc.c +++ b/sys/dev/ata/ata_wdc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata_wdc.c,v 1.82 2005/07/06 01:46:52 thorpej Exp $ */ +/* $NetBSD: ata_wdc.c,v 1.83 2005/12/11 12:21:14 christos Exp $ */ /* * Copyright (c) 1998, 2001, 2003 Manuel Bouyer. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.82 2005/07/06 01:46:52 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.83 2005/12/11 12:21:14 christos Exp $"); #ifndef ATADEBUG #define ATADEBUG diff --git a/sys/dev/ata/atareg.h b/sys/dev/ata/atareg.h index 2439cc7b118..505d92d1d5c 100644 --- a/sys/dev/ata/atareg.h +++ b/sys/dev/ata/atareg.h @@ -1,4 +1,4 @@ -/* $NetBSD: atareg.h,v 1.23 2005/04/12 11:45:40 drochner Exp $ */ +/* $NetBSD: atareg.h,v 1.24 2005/12/11 12:21:14 christos Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h index 5073aa20129..96fe3d0fd56 100644 --- a/sys/dev/ata/atavar.h +++ b/sys/dev/ata/atavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: atavar.h,v 1.69 2005/06/07 13:45:11 peter Exp $ */ +/* $NetBSD: atavar.h,v 1.70 2005/12/11 12:21:14 christos Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. diff --git a/sys/dev/ata/files.ata b/sys/dev/ata/files.ata index 806fef5da6e..72ea2741ccf 100644 --- a/sys/dev/ata/files.ata +++ b/sys/dev/ata/files.ata @@ -1,4 +1,4 @@ -# $NetBSD: files.ata,v 1.12 2005/06/20 02:11:57 briggs Exp $ +# $NetBSD: files.ata,v 1.13 2005/12/11 12:21:14 christos Exp $ # # Config file and device description for machine-independent devices # which attach to ATA busses. Included by ports that need it. Ports diff --git a/sys/dev/ata/ld_ataraid.c b/sys/dev/ata/ld_ataraid.c index e18f82dfa1e..0445a77559f 100644 --- a/sys/dev/ata/ld_ataraid.c +++ b/sys/dev/ata/ld_ataraid.c @@ -1,4 +1,4 @@ -/* $NetBSD: ld_ataraid.c,v 1.13 2004/10/28 07:07:39 yamt Exp $ */ +/* $NetBSD: ld_ataraid.c,v 1.14 2005/12/11 12:21:14 christos Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.13 2004/10/28 07:07:39 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.14 2005/12/11 12:21:14 christos Exp $"); #include "rnd.h" @@ -227,7 +227,7 @@ ld_ataraid_attach(struct device *parent, struct device *self, void *aux) vp = sc->sc_vnodes[i]; sc->sc_vnodes[i] = NULL; if (vp != NULL) - (void) vn_close(vp, FREAD|FWRITE, NOCRED, curproc); + (void) vn_close(vp, FREAD|FWRITE, NOCRED, curlwp); } finish: diff --git a/sys/dev/ata/sata_subr.c b/sys/dev/ata/sata_subr.c index 3b96665d576..d125ea396ec 100644 --- a/sys/dev/ata/sata_subr.c +++ b/sys/dev/ata/sata_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: sata_subr.c,v 1.1 2004/05/28 23:26:27 thorpej Exp $ */ +/* $NetBSD: sata_subr.c,v 1.2 2005/12/11 12:21:14 christos Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. diff --git a/sys/dev/ata/satapmpreg.h b/sys/dev/ata/satapmpreg.h index 5d2c536c040..208b7abfdf3 100644 --- a/sys/dev/ata/satapmpreg.h +++ b/sys/dev/ata/satapmpreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: satapmpreg.h,v 1.1 2004/08/21 02:25:26 thorpej Exp $ */ +/* $NetBSD: satapmpreg.h,v 1.2 2005/12/11 12:21:14 christos Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. diff --git a/sys/dev/ata/satareg.h b/sys/dev/ata/satareg.h index 324af26c4e0..17e3455a091 100644 --- a/sys/dev/ata/satareg.h +++ b/sys/dev/ata/satareg.h @@ -1,4 +1,4 @@ -/* $NetBSD: satareg.h,v 1.3 2004/05/23 23:07:59 wiz Exp $ */ +/* $NetBSD: satareg.h,v 1.4 2005/12/11 12:21:14 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. diff --git a/sys/dev/ata/satavar.h b/sys/dev/ata/satavar.h index e72c97b5106..7277f5f2284 100644 --- a/sys/dev/ata/satavar.h +++ b/sys/dev/ata/satavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: satavar.h,v 1.1 2004/05/28 23:26:27 thorpej Exp $ */ +/* $NetBSD: satavar.h,v 1.2 2005/12/11 12:21:14 christos Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index 27e2c875ddc..644c1750939 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.313 2005/11/01 20:44:04 martin Exp $ */ +/* $NetBSD: wd.c,v 1.314 2005/12/11 12:21:14 christos Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.313 2005/11/01 20:44:04 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.314 2005/12/11 12:21:14 christos Exp $"); #ifndef ATADEBUG #define ATADEBUG @@ -874,7 +874,7 @@ wdwrite(dev_t dev, struct uio *uio, int flags) } int -wdopen(dev_t dev, int flag, int fmt, struct proc *p) +wdopen(dev_t dev, int flag, int fmt, struct lwp *l) { struct wd_softc *wd; int part, error; @@ -962,7 +962,7 @@ wdopen(dev_t dev, int flag, int fmt, struct proc *p) } int -wdclose(dev_t dev, int flag, int fmt, struct proc *p) +wdclose(dev_t dev, int flag, int fmt, struct lwp *l) { struct wd_softc *wd = device_lookup(&wd_cd, WDUNIT(dev)); int part = WDPART(dev); @@ -1134,7 +1134,7 @@ wdperror(const struct wd_softc *wd) } int -wdioctl(dev_t dev, u_long xfer, caddr_t addr, int flag, struct proc *p) +wdioctl(dev_t dev, u_long xfer, caddr_t addr, int flag, struct lwp *l) { struct wd_softc *wd = device_lookup(&wd_cd, WDUNIT(dev)); int error = 0, s; @@ -1344,7 +1344,7 @@ bad: auio.uio_segflg = 0; auio.uio_offset = fop->df_startblk * wd->sc_dk.dk_label->d_secsize; - auio.uio_procp = p; + auio.uio_lwp = l; error = physio(wdformat, NULL, dev, B_WRITE, minphys, &auio); fop->df_count -= auio.uio_resid; @@ -1389,7 +1389,7 @@ bad: wi->wi_uio.uio_segflg = UIO_USERSPACE; wi->wi_uio.uio_rw = (atareq->flags & ATACMD_READ) ? B_READ : B_WRITE; - wi->wi_uio.uio_procp = p; + wi->wi_uio.uio_lwp = l; error1 = physio(wdioctlstrategy, &wi->wi_bp, dev, (atareq->flags & ATACMD_READ) ? B_READ : B_WRITE, minphys, &wi->wi_uio); @@ -1400,7 +1400,7 @@ bad: wi->wi_bp.b_data = 0; wi->wi_bp.b_bcount = 0; wi->wi_bp.b_dev = 0; - wi->wi_bp.b_proc = p; + wi->wi_bp.b_proc = l->l_proc; wdioctlstrategy(&wi->wi_bp); error1 = wi->wi_bp.b_error; } @@ -1437,7 +1437,7 @@ bad: { struct dkwedge_list *dkwl = (void *) addr; - return (dkwedge_list(&wd->sc_dk, dkwl, p)); + return (dkwedge_list(&wd->sc_dk, dkwl, l)); } default: diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h index 5d4a4b9e5ee..5bd337fda8b 100644 --- a/sys/dev/ata/wdvar.h +++ b/sys/dev/ata/wdvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: wdvar.h,v 1.31 2005/10/15 17:29:12 yamt Exp $ */ +/* $NetBSD: wdvar.h,v 1.32 2005/12/11 12:21:14 christos Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. |
