summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authoryamt <yamt@NetBSD.org>2004-10-28 07:07:35 +0000
committeryamt <yamt@NetBSD.org>2004-10-28 07:07:35 +0000
commit05f25dcc2aa59e68ab39db93cfe0f643b1d82418 (patch)
tree6fb17d81a81b26b2e704ff504f504c860d47bfb9 /sys/dev
parent043a545875d3fb1c0d349c3a5aace47eb3df1dd8 (diff)
move buffer queue related stuffs from buf.h to their own header, bufq.h.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/fdc_acpi.c5
-rw-r--r--sys/dev/ata/ata_raid.c5
-rw-r--r--sys/dev/ata/ata_raid_promise.c5
-rw-r--r--sys/dev/ata/ata_wdc.c5
-rw-r--r--sys/dev/ata/ld_ataraid.c5
-rw-r--r--sys/dev/ata/wd.c5
-rw-r--r--sys/dev/ccd.c5
-rw-r--r--sys/dev/cgd.c5
-rw-r--r--sys/dev/dksubr.c6
-rw-r--r--sys/dev/dkwedge/dk.c6
-rw-r--r--sys/dev/fss.c5
-rw-r--r--sys/dev/gpib/ct.c5
-rw-r--r--sys/dev/gpib/mt.c5
-rw-r--r--sys/dev/gpib/rd.c5
-rw-r--r--sys/dev/i2o/ld_iop.c5
-rw-r--r--sys/dev/ic/ld_aac.c5
-rw-r--r--sys/dev/ic/ld_cac.c5
-rw-r--r--sys/dev/ic/ld_icp.c5
-rw-r--r--sys/dev/ic/ld_mlx.c5
-rw-r--r--sys/dev/ic/mlx.c5
-rw-r--r--sys/dev/ic/rrunner.c5
-rw-r--r--sys/dev/isa/fd.c5
-rw-r--r--sys/dev/isa/mcd.c5
-rw-r--r--sys/dev/ld.c5
-rw-r--r--sys/dev/mca/ed_mca.c5
-rw-r--r--sys/dev/mca/edc_mca.c6
-rw-r--r--sys/dev/md.c5
-rw-r--r--sys/dev/mscp/mscp_subr.c5
-rw-r--r--sys/dev/pci/if_esh_pci.c5
-rw-r--r--sys/dev/pci/ld_amr.c5
-rw-r--r--sys/dev/pci/ld_twe.c5
-rw-r--r--sys/dev/qbus/rf.c5
-rw-r--r--sys/dev/qbus/rl.c5
-rw-r--r--sys/dev/qbus/ts.c5
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c5
-rw-r--r--sys/dev/scsipi/cd.c5
-rw-r--r--sys/dev/scsipi/sd.c5
-rw-r--r--sys/dev/scsipi/ss.c5
-rw-r--r--sys/dev/scsipi/ss_mustek.c5
-rw-r--r--sys/dev/scsipi/ss_scanjet.c5
-rw-r--r--sys/dev/scsipi/st.c5
-rw-r--r--sys/dev/scsipi/st_atapi.c5
-rw-r--r--sys/dev/scsipi/st_scsi.c5
-rw-r--r--sys/dev/usb/umass_scsipi.c5
-rw-r--r--sys/dev/vme/xd.c5
-rw-r--r--sys/dev/vme/xy.c5
-rw-r--r--sys/dev/vnd.c5
47 files changed, 144 insertions, 94 deletions
diff --git a/sys/dev/acpi/fdc_acpi.c b/sys/dev/acpi/fdc_acpi.c
index be3c11cd94c..2d76f1d4493 100644
--- a/sys/dev/acpi/fdc_acpi.c
+++ b/sys/dev/acpi/fdc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.22 2004/05/01 12:03:48 kochi Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.23 2004/10/28 07:07:39 yamt Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.22 2004/05/01 12:03:48 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.23 2004/10/28 07:07:39 yamt Exp $");
#include "rnd.h"
@@ -40,6 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.22 2004/05/01 12:03:48 kochi Exp $");
#include <sys/callout.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/queue.h>
#include <sys/disk.h>
#if NRND > 0
diff --git a/sys/dev/ata/ata_raid.c b/sys/dev/ata/ata_raid.c
index 603320938f4..7b5326cf3d2 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.10 2004/10/15 04:38:36 thorpej Exp $ */
+/* $NetBSD: ata_raid.c,v 1.11 2004/10/28 07:07:39 yamt Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,10 +40,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.10 2004/10/15 04:38:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.11 2004/10/28 07:07:39 yamt Exp $");
#include <sys/param.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/disk.h>
diff --git a/sys/dev/ata/ata_raid_promise.c b/sys/dev/ata/ata_raid_promise.c
index 801bab20b3a..1b7646fd663 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.3 2003/12/14 05:37:25 thorpej Exp $ */
+/* $NetBSD: ata_raid_promise.c,v 1.4 2004/10/28 07:07:39 yamt Exp $ */
/*-
* Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
@@ -35,10 +35,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_promise.c,v 1.3 2003/12/14 05:37:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_promise.c,v 1.4 2004/10/28 07:07:39 yamt Exp $");
#include <sys/param.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/disk.h>
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 5c0817be8d0..dc52bb22a19 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.75 2004/08/21 02:17:07 thorpej Exp $ */
+/* $NetBSD: ata_wdc.c,v 1.76 2004/10/28 07:07:39 yamt 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.75 2004/08/21 02:17:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.76 2004/10/28 07:07:39 yamt Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -78,6 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.75 2004/08/21 02:17:07 thorpej Exp $")
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/disklabel.h>
diff --git a/sys/dev/ata/ld_ataraid.c b/sys/dev/ata/ld_ataraid.c
index d0d6f6e3c22..e18f82dfa1e 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.12 2004/09/17 23:21:53 enami Exp $ */
+/* $NetBSD: ld_ataraid.c,v 1.13 2004/10/28 07:07:39 yamt Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.12 2004/09/17 23:21:53 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.13 2004/10/28 07:07:39 yamt Exp $");
#include "rnd.h"
@@ -55,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.12 2004/09/17 23:21:53 enami Exp $"
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/dkio.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 648a2b7ab8c..49a90667e85 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.295 2004/09/28 18:22:33 bouyer Exp $ */
+/* $NetBSD: wd.c,v 1.296 2004/10/28 07:07:39 yamt 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.295 2004/09/28 18:22:33 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.296 2004/10/28 07:07:39 yamt Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -82,6 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.295 2004/09/28 18:22:33 bouyer Exp $");
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/device.h>
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 41b57d2d19d..d7d38b848ef 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.100 2004/10/26 22:44:45 thorpej Exp $ */
+/* $NetBSD: ccd.c,v 1.101 2004/10/28 07:07:39 yamt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -125,13 +125,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.100 2004/10/26 22:44:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.101 2004/10/28 07:07:39 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/errno.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/namei.h>
diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c
index 47671dd37a5..08fb294172b 100644
--- a/sys/dev/cgd.c
+++ b/sys/dev/cgd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.20 2004/10/04 11:12:09 yamt Exp $ */
+/* $NetBSD: cgd.c,v 1.21 2004/10/28 07:07:39 yamt Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.20 2004/10/04 11:12:09 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.21 2004/10/28 07:07:39 yamt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.20 2004/10/04 11:12:09 yamt Exp $");
#include <sys/proc.h>
#include <sys/errno.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/ioctl.h>
diff --git a/sys/dev/dksubr.c b/sys/dev/dksubr.c
index 19cc1e3f471..f514aed7b36 100644
--- a/sys/dev/dksubr.c
+++ b/sys/dev/dksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.13 2004/08/23 05:39:46 thorpej Exp $ */
+/* $NetBSD: dksubr.c,v 1.14 2004/10/28 07:07:39 yamt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.13 2004/08/23 05:39:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.14 2004/10/28 07:07:39 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,6 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.13 2004/08/23 05:39:46 thorpej Exp $");
#include <sys/device.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
+#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/vnode.h>
#include <sys/fcntl.h>
#include <sys/namei.h>
diff --git a/sys/dev/dkwedge/dk.c b/sys/dev/dkwedge/dk.c
index c84ce48c943..29ec947b749 100644
--- a/sys/dev/dkwedge/dk.c
+++ b/sys/dev/dkwedge/dk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.4 2004/10/26 22:50:16 thorpej Exp $ */
+/* $NetBSD: dk.c,v 1.5 2004/10/28 07:07:40 yamt Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.4 2004/10/26 22:50:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.5 2004/10/28 07:07:40 yamt Exp $");
#include "opt_dkwedge.h"
@@ -50,6 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.4 2004/10/26 22:50:16 thorpej Exp $");
#include <sys/disklabel.h>
#include <sys/disk.h>
#include <sys/fcntl.h>
+#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/vnode.h>
#include <sys/stat.h>
#include <sys/conf.h>
diff --git a/sys/dev/fss.c b/sys/dev/fss.c
index 346b1e409f1..329edaca3a1 100644
--- a/sys/dev/fss.c
+++ b/sys/dev/fss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.9 2004/06/20 18:55:58 hannken Exp $ */
+/* $NetBSD: fss.c,v 1.10 2004/10/28 07:07:39 yamt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.9 2004/06/20 18:55:58 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.10 2004/10/28 07:07:39 yamt Exp $");
#include "fss.h"
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.9 2004/06/20 18:55:58 hannken Exp $");
#include <sys/proc.h>
#include <sys/errno.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/disklabel.h>
diff --git a/sys/dev/gpib/ct.c b/sys/dev/gpib/ct.c
index c682593db7d..1b3e968c18f 100644
--- a/sys/dev/gpib/ct.c
+++ b/sys/dev/gpib/ct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ct.c,v 1.2 2003/08/07 16:30:55 agc Exp $ */
+/* $NetBSD: ct.c,v 1.3 2004/10/28 07:07:40 yamt Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -128,11 +128,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.2 2003/08/07 16:30:55 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.3 2004/10/28 07:07:40 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
diff --git a/sys/dev/gpib/mt.c b/sys/dev/gpib/mt.c
index a7e95bfceb0..e7d9c54056c 100644
--- a/sys/dev/gpib/mt.c
+++ b/sys/dev/gpib/mt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mt.c,v 1.2 2003/08/07 16:30:56 agc Exp $ */
+/* $NetBSD: mt.c,v 1.3 2004/10/28 07:07:40 yamt Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -121,12 +121,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.2 2003/08/07 16:30:56 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.3 2004/10/28 07:07:40 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/callout.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/ioctl.h>
#include <sys/mtio.h>
#include <sys/file.h>
diff --git a/sys/dev/gpib/rd.c b/sys/dev/gpib/rd.c
index cef9fe63e03..a15424917f8 100644
--- a/sys/dev/gpib/rd.c
+++ b/sys/dev/gpib/rd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.3 2004/08/28 17:45:24 thorpej Exp $ */
+/* $NetBSD: rd.c,v 1.4 2004/10/28 07:07:40 yamt Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -118,13 +118,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.3 2004/08/28 17:45:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.4 2004/10/28 07:07:40 yamt Exp $");
#include "rnd.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/callout.h>
#include <sys/conf.h>
#include <sys/device.h>
diff --git a/sys/dev/i2o/ld_iop.c b/sys/dev/i2o/ld_iop.c
index af3e7339946..1a0080af21f 100644
--- a/sys/dev/i2o/ld_iop.c
+++ b/sys/dev/i2o/ld_iop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_iop.c,v 1.14 2004/04/19 12:44:10 wiz Exp $ */
+/* $NetBSD: ld_iop.c,v 1.15 2004/10/28 07:07:40 yamt Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.14 2004/04/19 12:44:10 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.15 2004/10/28 07:07:40 yamt Exp $");
#include "opt_i2o.h"
#include "rnd.h"
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.14 2004/04/19 12:44:10 wiz Exp $");
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
diff --git a/sys/dev/ic/ld_aac.c b/sys/dev/ic/ld_aac.c
index e8bac35ee80..3052233ee2c 100644
--- a/sys/dev/ic/ld_aac.c
+++ b/sys/dev/ic/ld_aac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_aac.c,v 1.5 2002/10/02 16:33:33 thorpej Exp $ */
+/* $NetBSD: ld_aac.c,v 1.6 2004/10/28 07:07:40 yamt Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.5 2002/10/02 16:33:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.6 2004/10/28 07:07:40 yamt Exp $");
#include "rnd.h"
@@ -46,6 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.5 2002/10/02 16:33:33 thorpej Exp $");
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
diff --git a/sys/dev/ic/ld_cac.c b/sys/dev/ic/ld_cac.c
index 93f08c78dcb..f71ef0c0f91 100644
--- a/sys/dev/ic/ld_cac.c
+++ b/sys/dev/ic/ld_cac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_cac.c,v 1.8 2002/10/02 16:33:33 thorpej Exp $ */
+/* $NetBSD: ld_cac.c,v 1.9 2004/10/28 07:07:40 yamt Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.8 2002/10/02 16:33:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.9 2004/10/28 07:07:40 yamt Exp $");
#include "rnd.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.8 2002/10/02 16:33:33 thorpej Exp $");
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
diff --git a/sys/dev/ic/ld_icp.c b/sys/dev/ic/ld_icp.c
index 666b993d531..06e008dc064 100644
--- a/sys/dev/ic/ld_icp.c
+++ b/sys/dev/ic/ld_icp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_icp.c,v 1.8 2003/06/13 05:57:31 thorpej Exp $ */
+/* $NetBSD: ld_icp.c,v 1.9 2004/10/28 07:07:40 yamt Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.8 2003/06/13 05:57:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.9 2004/10/28 07:07:40 yamt Exp $");
#include "rnd.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.8 2003/06/13 05:57:31 thorpej Exp $");
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
diff --git a/sys/dev/ic/ld_mlx.c b/sys/dev/ic/ld_mlx.c
index b748a9f0d55..58095ad0ced 100644
--- a/sys/dev/ic/ld_mlx.c
+++ b/sys/dev/ic/ld_mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_mlx.c,v 1.7 2002/10/02 16:33:34 thorpej Exp $ */
+/* $NetBSD: ld_mlx.c,v 1.8 2004/10/28 07:07:40 yamt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.7 2002/10/02 16:33:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.8 2004/10/28 07:07:40 yamt Exp $");
#include "rnd.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.7 2002/10/02 16:33:34 thorpej Exp $");
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
diff --git a/sys/dev/ic/mlx.c b/sys/dev/ic/mlx.c
index de925b26e97..08e04c92144 100644
--- a/sys/dev/ic/mlx.c
+++ b/sys/dev/ic/mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx.c,v 1.30 2004/09/13 12:55:47 drochner Exp $ */
+/* $NetBSD: mlx.c,v 1.31 2004/10/28 07:07:40 yamt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.30 2004/09/13 12:55:47 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.31 2004/10/28 07:07:40 yamt Exp $");
#include "ld.h"
@@ -85,6 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.30 2004/09/13 12:55:47 drochner Exp $");
#include <sys/queue.h>
#include <sys/proc.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/endian.h>
#include <sys/malloc.h>
#include <sys/conf.h>
diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c
index ad411e668da..2f310bd88ce 100644
--- a/sys/dev/ic/rrunner.c
+++ b/sys/dev/ic/rrunner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rrunner.c,v 1.45 2004/04/22 00:17:11 itojun Exp $ */
+/* $NetBSD: rrunner.c,v 1.46 2004/10/28 07:07:40 yamt 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.45 2004/04/22 00:17:11 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.46 2004/10/28 07:07:40 yamt Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -54,6 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.45 2004/04/22 00:17:11 itojun Exp $");
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 4a8d60f20b2..068e334ff72 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.54 2004/09/18 16:40:11 yamt Exp $ */
+/* $NetBSD: fd.c,v 1.55 2004/10/28 07:07:40 yamt Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.54 2004/09/18 16:40:11 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.55 2004/10/28 07:07:40 yamt Exp $");
#include "rnd.h"
#include "opt_ddb.h"
@@ -113,6 +113,7 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.54 2004/09/18 16:40:11 yamt Exp $");
#include <sys/disklabel.h>
#include <sys/disk.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/malloc.h>
#include <sys/uio.h>
#include <sys/syslog.h>
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 14620655f35..5b96ad30d70 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcd.c,v 1.86 2004/09/14 20:20:48 drochner Exp $ */
+/* $NetBSD: mcd.c,v 1.87 2004/10/28 07:07:40 yamt Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -56,7 +56,7 @@
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.86 2004/09/14 20:20:48 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.87 2004/10/28 07:07:40 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,6 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.86 2004/09/14 20:20:48 drochner Exp $");
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/stat.h>
#include <sys/uio.h>
#include <sys/ioctl.h>
diff --git a/sys/dev/ld.c b/sys/dev/ld.c
index c3f8408102e..163ccdaec7b 100644
--- a/sys/dev/ld.c
+++ b/sys/dev/ld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.32 2004/10/26 22:46:13 thorpej Exp $ */
+/* $NetBSD: ld.c,v 1.33 2004/10/28 07:07:39 yamt Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.32 2004/10/26 22:46:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.33 2004/10/28 07:07:39 yamt Exp $");
#include "rnd.h"
@@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.32 2004/10/26 22:46:13 thorpej Exp $");
#include <sys/queue.h>
#include <sys/proc.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/endian.h>
#include <sys/disklabel.h>
#include <sys/disk.h>
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index 6c0d7f1bcb4..0ea68dd211a 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.26 2004/09/25 16:13:42 thorpej Exp $ */
+/* $NetBSD: ed_mca.c,v 1.27 2004/10/28 07:07:40 yamt Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.26 2004/09/25 16:13:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.27 2004/10/28 07:07:40 yamt Exp $");
#include "rnd.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.26 2004/09/25 16:13:42 thorpej Exp $");
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/device.h>
diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c
index 737fe752b1c..00795869b12 100644
--- a/sys/dev/mca/edc_mca.c
+++ b/sys/dev/mca/edc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.25 2004/09/01 20:57:58 drochner Exp $ */
+/* $NetBSD: edc_mca.c,v 1.26 2004/10/28 07:07:40 yamt Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -50,12 +50,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.25 2004/09/01 20:57:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.26 2004/10/28 07:07:40 yamt Exp $");
#include "rnd.h"
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/errno.h>
#include <sys/device.h>
#include <sys/malloc.h>
diff --git a/sys/dev/md.c b/sys/dev/md.c
index bcd8442f90f..fe0133d73ab 100644
--- a/sys/dev/md.c
+++ b/sys/dev/md.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.38 2004/08/30 00:34:42 thorpej Exp $ */
+/* $NetBSD: md.c,v 1.39 2004/10/28 07:07:39 yamt Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.38 2004/08/30 00:34:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.39 2004/10/28 07:07:39 yamt Exp $");
#include "opt_md.h"
@@ -55,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: md.c,v 1.38 2004/08/30 00:34:42 thorpej Exp $");
#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/device.h>
#include <sys/disk.h>
#include <sys/proc.h>
diff --git a/sys/dev/mscp/mscp_subr.c b/sys/dev/mscp/mscp_subr.c
index 3e0d7575574..6ff3586b9ec 100644
--- a/sys/dev/mscp/mscp_subr.c
+++ b/sys/dev/mscp/mscp_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_subr.c,v 1.24 2003/08/07 16:31:09 agc Exp $ */
+/* $NetBSD: mscp_subr.c,v 1.25 2004/10/28 07:07:40 yamt Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -75,11 +75,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.24 2003/08/07 16:31:09 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.25 2004/10/28 07:07:40 yamt Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/dev/pci/if_esh_pci.c b/sys/dev/pci/if_esh_pci.c
index 6d0dfb7227c..6f49f8ca3ae 100644
--- a/sys/dev/pci/if_esh_pci.c
+++ b/sys/dev/pci/if_esh_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_esh_pci.c,v 1.15 2004/08/21 23:48:33 thorpej Exp $ */
+/* $NetBSD: if_esh_pci.c,v 1.16 2004/10/28 07:07:41 yamt Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.15 2004/08/21 23:48:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.16 2004/10/28 07:07:41 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.15 2004/08/21 23:48:33 thorpej Exp
#include <sys/select.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/pci/ld_amr.c b/sys/dev/pci/ld_amr.c
index 63b6f5d35af..3b30ec9fcdf 100644
--- a/sys/dev/pci/ld_amr.c
+++ b/sys/dev/pci/ld_amr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_amr.c,v 1.5 2003/05/04 16:15:36 ad Exp $ */
+/* $NetBSD: ld_amr.c,v 1.6 2004/10/28 07:07:41 yamt Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.5 2003/05/04 16:15:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.6 2004/10/28 07:07:41 yamt Exp $");
#include "rnd.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.5 2003/05/04 16:15:36 ad Exp $");
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
diff --git a/sys/dev/pci/ld_twe.c b/sys/dev/pci/ld_twe.c
index 4b26f4563e6..b0837121934 100644
--- a/sys/dev/pci/ld_twe.c
+++ b/sys/dev/pci/ld_twe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_twe.c,v 1.20 2004/05/27 23:48:34 thorpej Exp $ */
+/* $NetBSD: ld_twe.c,v 1.21 2004/10/28 07:07:41 yamt Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.20 2004/05/27 23:48:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.21 2004/10/28 07:07:41 yamt Exp $");
#include "rnd.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.20 2004/05/27 23:48:34 thorpej Exp $");
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/endian.h>
#include <sys/dkio.h>
#include <sys/disk.h>
diff --git a/sys/dev/qbus/rf.c b/sys/dev/qbus/rf.c
index 17d7addd096..74413792e36 100644
--- a/sys/dev/qbus/rf.c
+++ b/sys/dev/qbus/rf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf.c,v 1.6 2004/10/06 12:12:42 wiz Exp $ */
+/* $NetBSD: rf.c,v 1.7 2004/10/28 07:07:41 yamt Exp $ */
/*
* Copyright (c) 2002 Jochen Kunz.
* All rights reserved.
@@ -36,7 +36,7 @@ TODO:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.6 2004/10/06 12:12:42 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.7 2004/10/28 07:07:41 yamt Exp $");
/* autoconfig stuff */
#include <sys/param.h>
@@ -63,6 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.6 2004/10/06 12:12:42 wiz Exp $");
/* physio / buffer handling */
#include <sys/buf.h>
+#include <sys/bufq.h>
/* tsleep / sleep / wakeup */
#include <sys/proc.h>
diff --git a/sys/dev/qbus/rl.c b/sys/dev/qbus/rl.c
index 175326fe120..140932f890d 100644
--- a/sys/dev/qbus/rl.c
+++ b/sys/dev/qbus/rl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rl.c,v 1.22 2004/09/25 16:27:38 thorpej Exp $ */
+/* $NetBSD: rl.c,v 1.23 2004/10/28 07:07:41 yamt Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.22 2004/09/25 16:27:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.23 2004/10/28 07:07:41 yamt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.22 2004/09/25 16:27:38 thorpej Exp $");
#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/stat.h>
#include <sys/dkio.h>
#include <sys/fcntl.h>
diff --git a/sys/dev/qbus/ts.c b/sys/dev/qbus/ts.c
index bbc6c37463c..bdf644849ce 100644
--- a/sys/dev/qbus/ts.c
+++ b/sys/dev/qbus/ts.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ts.c,v 1.11 2003/08/07 16:31:17 agc Exp $ */
+/* $NetBSD: ts.c,v 1.12 2004/10/28 07:07:41 yamt Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.11 2003/08/07 16:31:17 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.12 2004/10/28 07:07:41 yamt Exp $");
#undef TSDEBUG
@@ -82,6 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.11 2003/08/07 16:31:17 agc Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/conf.h>
#include <sys/errno.h>
#include <sys/file.h>
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 1a922c1adf7..d0cdb194dd9 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.181 2004/10/15 06:41:35 thorpej Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.182 2004/10/28 07:07:44 yamt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -146,7 +146,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.181 2004/10/15 06:41:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.182 2004/10/28 07:07:44 yamt Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -165,6 +165,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.181 2004/10/15 06:41:35 thorpej
#include <sys/conf.h>
#include <sys/lock.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/user.h>
#include <sys/reboot.h>
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index a66706ab48c..008052811fe 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.210 2004/09/26 09:00:37 dogcow Exp $ */
+/* $NetBSD: cd.c,v 1.211 2004/10/28 07:07:45 yamt Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.210 2004/09/26 09:00:37 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.211 2004/10/28 07:07:45 yamt Exp $");
#include "rnd.h"
@@ -65,6 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.210 2004/09/26 09:00:37 dogcow Exp $");
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/errno.h>
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index 11b1c96850d..a6f4993474b 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.228 2004/09/26 09:00:37 dogcow Exp $ */
+/* $NetBSD: sd.c,v 1.229 2004/10/28 07:07:45 yamt Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.228 2004/09/26 09:00:37 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.229 2004/10/28 07:07:45 yamt Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -67,6 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.228 2004/09/26 09:00:37 dogcow Exp $");
#include <sys/ioctl.h>
#include <sys/scsiio.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/errno.h>
diff --git a/sys/dev/scsipi/ss.c b/sys/dev/scsipi/ss.c
index b11259f4c24..254d2c54873 100644
--- a/sys/dev/scsipi/ss.c
+++ b/sys/dev/scsipi/ss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.56 2004/10/17 17:49:04 bouyer Exp $ */
+/* $NetBSD: ss.c,v 1.57 2004/10/28 07:07:45 yamt Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.56 2004/10/17 17:49:04 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.57 2004/10/28 07:07:45 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,6 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.56 2004/10/17 17:49:04 bouyer Exp $");
#include <sys/ioctl.h>
#include <sys/malloc.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/device.h>
diff --git a/sys/dev/scsipi/ss_mustek.c b/sys/dev/scsipi/ss_mustek.c
index db195600058..3d29320e794 100644
--- a/sys/dev/scsipi/ss_mustek.c
+++ b/sys/dev/scsipi/ss_mustek.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ss_mustek.c,v 1.26 2004/10/17 17:49:04 bouyer Exp $ */
+/* $NetBSD: ss_mustek.c,v 1.27 2004/10/28 07:07:45 yamt Exp $ */
/*
* Copyright (c) 1995 Joachim Koenig-Baltes. All rights reserved.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.26 2004/10/17 17:49:04 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.27 2004/10/28 07:07:45 yamt Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -56,6 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.26 2004/10/17 17:49:04 bouyer Exp $"
#include <sys/ioctl.h>
#include <sys/malloc.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/device.h>
diff --git a/sys/dev/scsipi/ss_scanjet.c b/sys/dev/scsipi/ss_scanjet.c
index ff58e02952e..01480a69419 100644
--- a/sys/dev/scsipi/ss_scanjet.c
+++ b/sys/dev/scsipi/ss_scanjet.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ss_scanjet.c,v 1.36 2004/09/18 00:21:03 mycroft Exp $ */
+/* $NetBSD: ss_scanjet.c,v 1.37 2004/10/28 07:07:45 yamt Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.36 2004/09/18 00:21:03 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.37 2004/10/28 07:07:45 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,6 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.36 2004/09/18 00:21:03 mycroft Exp
#include <sys/ioctl.h>
#include <sys/malloc.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/device.h>
diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c
index d8a0023ef5d..33e52cb732d 100644
--- a/sys/dev/scsipi/st.c
+++ b/sys/dev/scsipi/st.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st.c,v 1.172 2004/09/26 09:00:37 dogcow Exp $ */
+/* $NetBSD: st.c,v 1.173 2004/10/28 07:07:45 yamt Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.172 2004/09/26 09:00:37 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.173 2004/10/28 07:07:45 yamt Exp $");
#include "opt_scsi.h"
@@ -68,6 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: st.c,v 1.172 2004/09/26 09:00:37 dogcow Exp $");
#include <sys/ioctl.h>
#include <sys/malloc.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/mtio.h>
diff --git a/sys/dev/scsipi/st_atapi.c b/sys/dev/scsipi/st_atapi.c
index 776c850cd96..bcf3b0733d9 100644
--- a/sys/dev/scsipi/st_atapi.c
+++ b/sys/dev/scsipi/st_atapi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st_atapi.c,v 1.13 2004/08/21 22:16:07 thorpej Exp $ */
+/* $NetBSD: st_atapi.c,v 1.14 2004/10/28 07:07:46 yamt Exp $ */
/*
* Copyright (c) 2001 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.13 2004/08/21 22:16:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.14 2004/10/28 07:07:46 yamt Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -39,6 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.13 2004/08/21 22:16:07 thorpej Exp $"
#include <sys/param.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/systm.h>
diff --git a/sys/dev/scsipi/st_scsi.c b/sys/dev/scsipi/st_scsi.c
index be484753112..d553f374166 100644
--- a/sys/dev/scsipi/st_scsi.c
+++ b/sys/dev/scsipi/st_scsi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st_scsi.c,v 1.15 2004/09/18 00:21:03 mycroft Exp $ */
+/* $NetBSD: st_scsi.c,v 1.16 2004/10/28 07:07:46 yamt Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.15 2004/09/18 00:21:03 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.16 2004/10/28 07:07:46 yamt Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -65,6 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.15 2004/09/18 00:21:03 mycroft Exp $")
#include <sys/param.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/umass_scsipi.c b/sys/dev/usb/umass_scsipi.c
index 755ef292739..82674e7fb3c 100644
--- a/sys/dev/usb/umass_scsipi.c
+++ b/sys/dev/usb/umass_scsipi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.20 2004/09/18 16:40:11 yamt Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.21 2004/10/28 07:07:46 yamt Exp $ */
/*
* Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.20 2004/09/18 16:40:11 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.21 2004/10/28 07:07:46 yamt Exp $");
#include "atapibus.h"
#include "scsibus.h"
@@ -48,6 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.20 2004/09/18 16:40:11 yamt Exp $
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/malloc.h>
diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c
index 1c572bbb4d4..e22c7f070cd 100644
--- a/sys/dev/vme/xd.c
+++ b/sys/dev/vme/xd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.54 2003/09/29 09:50:22 wiz Exp $ */
+/* $NetBSD: xd.c,v 1.55 2004/10/28 07:07:46 yamt Exp $ */
/*
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.54 2003/09/29 09:50:22 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.55 2004/10/28 07:07:46 yamt Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -67,6 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.54 2003/09/29 09:50:22 wiz Exp $");
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/device.h>
diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c
index 3ae5915f6db..0bf12d80587 100644
--- a/sys/dev/vme/xy.c
+++ b/sys/dev/vme/xy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.55 2003/12/23 13:15:18 pk Exp $ */
+/* $NetBSD: xy.c,v 1.56 2004/10/28 07:07:46 yamt Exp $ */
/*
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.55 2003/12/23 13:15:18 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.56 2004/10/28 07:07:46 yamt Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -67,6 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.55 2003/12/23 13:15:18 pk Exp $");
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/device.h>
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 597cde3c357..9ed70e37bdb 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.110 2004/09/18 16:40:11 yamt Exp $ */
+/* $NetBSD: vnd.c,v 1.111 2004/10/28 07:07:39 yamt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.110 2004/09/18 16:40:11 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.111 2004/10/28 07:07:39 yamt Exp $");
#if defined(_KERNEL_OPT)
#include "fs_nfs.h"
@@ -145,6 +145,7 @@ __KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.110 2004/09/18 16:40:11 yamt Exp $");
#include <sys/proc.h>
#include <sys/errno.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/disklabel.h>