summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2001-11-06 19:53:22 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2001-11-06 19:53:22 +0000
commit1a05584a00bbab0c5d169a8d3af7b22cafbfd92e (patch)
tree5ddd0ec6d94f69ad3960926e58a87b6d82166c7a /sys/dev/ic
parentef75d88ca83504eb18013af4622826ef9b5ff28d (diff)
Replace inclusion of <vm/foo.h> with the correct <uvm/bar.h> when necessary.
(Look ma, I might have broken the tree)
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/aac.c4
-rw-r--r--sys/dev/ic/adv.c4
-rw-r--r--sys/dev/ic/advlib.c4
-rw-r--r--sys/dev/ic/adw.c4
-rw-r--r--sys/dev/ic/adwlib.c4
-rw-r--r--sys/dev/ic/aic7xxx.c4
-rw-r--r--sys/dev/ic/ami.c3
-rw-r--r--sys/dev/ic/bt463.c4
-rw-r--r--sys/dev/ic/bt485.c4
-rw-r--r--sys/dev/ic/cac.c3
-rw-r--r--sys/dev/ic/dc.c4
-rw-r--r--sys/dev/ic/fxp.c4
-rw-r--r--sys/dev/ic/gdt_common.c4
-rw-r--r--sys/dev/ic/gem.c3
-rw-r--r--sys/dev/ic/i82365.c4
-rw-r--r--sys/dev/ic/i82596.c4
-rw-r--r--sys/dev/ic/isp_openbsd.h4
-rw-r--r--sys/dev/ic/lsi64854.c3
-rw-r--r--sys/dev/ic/midway.c4
-rw-r--r--sys/dev/ic/pdq_ifsubr.c4
-rw-r--r--sys/dev/ic/pdqvar.h3
-rw-r--r--sys/dev/ic/rtl81x9.c4
-rw-r--r--sys/dev/ic/sti.c3
-rw-r--r--sys/dev/ic/tcic2.c4
-rw-r--r--sys/dev/ic/wdc.c4
-rw-r--r--sys/dev/ic/xl.c4
26 files changed, 46 insertions, 52 deletions
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 1b69cbd1821..7f7b49a688a 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aac.c,v 1.9 2001/11/05 17:25:58 art Exp $ */
+/* $OpenBSD: aac.c,v 1.10 2001/11/06 19:53:18 miod Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
@@ -51,7 +51,7 @@
#include <machine/bus.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <scsi/scsi_all.h>
#include <scsi/scsi_disk.h>
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index 5200e1d0b78..023b9ec3c3c 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adv.c,v 1.10 2001/11/05 17:25:58 art Exp $ */
+/* $OpenBSD: adv.c,v 1.11 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */
/*
@@ -53,7 +53,7 @@
#include <machine/bus.h>
#include <machine/intr.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
diff --git a/sys/dev/ic/advlib.c b/sys/dev/ic/advlib.c
index 8d50a8c43cf..e44145d4eaf 100644
--- a/sys/dev/ic/advlib.c
+++ b/sys/dev/ic/advlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: advlib.c,v 1.6 2001/08/12 20:33:50 mickey Exp $ */
+/* $OpenBSD: advlib.c,v 1.7 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: advlib.c,v 1.7 1998/10/28 20:39:46 dante Exp $ */
/*
@@ -67,7 +67,7 @@
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <dev/ic/adv.h>
#include <dev/ic/advlib.h>
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index 6ab8bb987d4..cdbdacfd710 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adw.c,v 1.23 2001/11/05 17:25:58 art Exp $ */
+/* $OpenBSD: adw.c,v 1.24 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */
/*
@@ -54,7 +54,7 @@
#include <machine/bus.h>
#include <machine/intr.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c
index 9c32768b15e..032f00b6a25 100644
--- a/sys/dev/ic/adwlib.c
+++ b/sys/dev/ic/adwlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adwlib.c,v 1.14 2001/07/11 17:31:25 krw Exp $ */
+/* $OpenBSD: adwlib.c,v 1.15 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: adwlib.c,v 1.20 2000/07/04 04:17:03 itojun Exp $ */
/*
@@ -68,7 +68,7 @@
#include <dev/pci/pcidevs.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <dev/ic/adwlib.h>
#include <dev/microcode/adw/adwmcode.h>
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index d1bbca9dd1b..2ea3fa6c03a 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.40 2000/01/07 23:08:17 gibbs Exp $
- * $OpenBSD: aic7xxx.c,v 1.32 2001/11/05 17:25:58 art Exp $
+ * $OpenBSD: aic7xxx.c,v 1.33 2001/11/06 19:53:18 miod Exp $
*/
/*
* A few notes on features of the driver.
@@ -100,7 +100,7 @@
#include <scsi/scsi_debug.h>
#include <scsi/scsiconf.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <dev/ic/aic7xxxreg.h>
#include <dev/ic/aic7xxxvar.h>
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index 35a73263a2d..1c761cf930f 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ami.c,v 1.12 2001/11/05 17:25:58 art Exp $ */
+/* $OpenBSD: ami.c,v 1.13 2001/11/06 19:53:18 miod Exp $ */
/*
* Copyright (c) 2001 Michael Shalayeff
@@ -60,7 +60,6 @@
#include <machine/bus.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <scsi/scsi_all.h>
diff --git a/sys/dev/ic/bt463.c b/sys/dev/ic/bt463.c
index 2e9cbb91e85..8d3ee43af99 100644
--- a/sys/dev/ic/bt463.c
+++ b/sys/dev/ic/bt463.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bt463.c,v 1.4 2001/06/27 04:45:57 art Exp $ */
+/* $OpenBSD: bt463.c,v 1.5 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: bt463.c,v 1.2 2000/06/13 17:21:06 nathanw Exp $ */
/*-
@@ -76,7 +76,7 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/tgareg.h>
diff --git a/sys/dev/ic/bt485.c b/sys/dev/ic/bt485.c
index 0522246f238..203ed7995bf 100644
--- a/sys/dev/ic/bt485.c
+++ b/sys/dev/ic/bt485.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bt485.c,v 1.6 2001/06/27 04:45:58 art Exp $ */
+/* $OpenBSD: bt485.c,v 1.7 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: bt485.c,v 1.2 2000/04/02 18:55:01 nathanw Exp $ */
/*
@@ -39,7 +39,7 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <dev/pci/pcivar.h>
#include <dev/ic/bt485reg.h>
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 0dc2bbaf0bd..01c44d9ed33 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cac.c,v 1.8 2001/11/05 17:25:58 art Exp $ */
+/* $OpenBSD: cac.c,v 1.9 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $ */
/*
@@ -87,7 +87,6 @@
#include <sys/malloc.h>
#include <sys/pool.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index 85212ccc4ee..e8463ecc594 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dc.c,v 1.33 2001/08/22 16:38:38 aaron Exp $ */
+/* $OpenBSD: dc.c,v 1.34 2001/11/06 19:53:18 miod Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -122,7 +122,7 @@
#include <net/bpf.h>
#endif
-#include <vm/vm.h> /* for vtophys */
+#include <uvm/uvm_extern.h> /* for vtophys */
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c
index e107cb76b81..bc1f57e079b 100644
--- a/sys/dev/ic/fxp.c
+++ b/sys/dev/ic/fxp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fxp.c,v 1.29 2001/11/05 17:25:58 art Exp $ */
+/* $OpenBSD: fxp.c,v 1.30 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $ */
/*
@@ -82,7 +82,7 @@
#include <netinet/if_ether.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index 90e139dac90..dcac4ac513b 100644
--- a/sys/dev/ic/gdt_common.c
+++ b/sys/dev/ic/gdt_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gdt_common.c,v 1.15 2001/11/05 17:25:58 art Exp $ */
+/* $OpenBSD: gdt_common.c,v 1.16 2001/11/06 19:53:18 miod Exp $ */
/*
* Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved.
@@ -43,7 +43,7 @@
#include <machine/bus.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <scsi/scsi_all.h>
#include <scsi/scsi_disk.h>
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index 495690e03d5..506346ccd1a 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gem.c,v 1.11 2001/10/03 18:18:01 jason Exp $ */
+/* $OpenBSD: gem.c,v 1.12 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
/*
@@ -51,7 +51,6 @@
#include <machine/endian.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <net/if.h>
diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c
index b3618b3095b..fe75659725d 100644
--- a/sys/dev/ic/i82365.c
+++ b/sys/dev/ic/i82365.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365.c,v 1.20 2001/08/17 20:44:11 millert Exp $ */
+/* $OpenBSD: i82365.c,v 1.21 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: i82365.c,v 1.10 1998/06/09 07:36:55 thorpej Exp $ */
/*
@@ -39,7 +39,7 @@
#include <sys/malloc.h>
#include <sys/kthread.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c
index 9bd7b984aa8..b1ae92ea14b 100644
--- a/sys/dev/ic/i82596.c
+++ b/sys/dev/ic/i82596.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82596.c,v 1.6 2001/06/27 06:34:42 kjc Exp $ */
+/* $OpenBSD: i82596.c,v 1.7 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $ */
/*-
@@ -170,7 +170,7 @@ Mode of operation:
#include <netinet/if_ether.h>
#endif
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/isp_openbsd.h b/sys/dev/ic/isp_openbsd.h
index ddc0aa3e06d..408551e8303 100644
--- a/sys/dev/ic/isp_openbsd.h
+++ b/sys/dev/ic/isp_openbsd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_openbsd.h,v 1.16 2001/09/01 07:16:40 mjacob Exp $ */
+/* $OpenBSD: isp_openbsd.h,v 1.17 2001/11/06 19:53:18 miod Exp $ */
/*
* OpenBSD Specific definitions for the Qlogic ISP Host Adapter
*/
@@ -48,7 +48,7 @@
#include <scsi/scsi_message.h>
#include <scsi/scsi_debug.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#define ISP_PLATFORM_VERSION_MAJOR 2
diff --git a/sys/dev/ic/lsi64854.c b/sys/dev/ic/lsi64854.c
index dea5b6612b1..290244dbcbc 100644
--- a/sys/dev/ic/lsi64854.c
+++ b/sys/dev/ic/lsi64854.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lsi64854.c,v 1.3 2001/09/11 20:05:25 miod Exp $ */
+/* $OpenBSD: lsi64854.c,v 1.4 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: lsi64854.c,v 1.18 2001/06/04 20:56:51 mrg Exp $ */
/*-
@@ -44,7 +44,6 @@
#include <sys/errno.h>
#include <sys/device.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c
index 107350bc320..bbbbd6ae2be 100644
--- a/sys/dev/ic/midway.c
+++ b/sys/dev/ic/midway.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: midway.c,v 1.28 2001/06/27 06:34:42 kjc Exp $ */
+/* $OpenBSD: midway.c,v 1.29 2001/11/06 19:53:18 miod Exp $ */
/* (sync'd to midway.c 1.68) */
/*
@@ -132,7 +132,7 @@
#include <net/if.h>
#include <net/if_atm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#ifdef INET
#include <netinet/if_atm.h>
diff --git a/sys/dev/ic/pdq_ifsubr.c b/sys/dev/ic/pdq_ifsubr.c
index 775a5c399d5..198091004d7 100644
--- a/sys/dev/ic/pdq_ifsubr.c
+++ b/sys/dev/ic/pdq_ifsubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdq_ifsubr.c,v 1.9 2001/09/11 20:05:25 miod Exp $ */
+/* $OpenBSD: pdq_ifsubr.c,v 1.10 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: pdq_ifsubr.c,v 1.5 1996/05/20 00:26:21 thorpej Exp $ */
/*-
@@ -83,7 +83,7 @@
#include <netns/ns_if.h>
#endif
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include "pdqvar.h"
#include "pdqreg.h"
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h
index 2286f72e86a..1bc491d86fb 100644
--- a/sys/dev/ic/pdqvar.h
+++ b/sys/dev/ic/pdqvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdqvar.h,v 1.13 2001/09/19 20:50:58 mickey Exp $ */
+/* $OpenBSD: pdqvar.h,v 1.14 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: pdqvar.h,v 1.11 1996/10/25 21:33:37 cgd Exp $ */
/*-
@@ -70,7 +70,6 @@ enum _pdq_type_t {
#include <sys/mbuf.h>
#endif /* M_CAST */
#include <sys/malloc.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#define PDQ_USE_MBUFS
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index 43d4e71f276..8fbe3b4496b 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtl81x9.c,v 1.10 2001/10/24 16:56:56 mickey Exp $ */
+/* $OpenBSD: rtl81x9.c,v 1.11 2001/11/06 19:53:18 miod Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -114,7 +114,7 @@
#include <net/bpf.h>
#endif
-#include <vm/vm.h> /* for vtophys */
+#include <uvm/uvm_extern.h> /* for vtophys */
#include <machine/bus.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index 49d771c4b87..2029603fdab 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sti.c,v 1.6 2001/09/19 20:50:58 mickey Exp $ */
+/* $OpenBSD: sti.c,v 1.7 2001/11/06 19:53:18 miod Exp $ */
/*
* Copyright (c) 2000-2001 Michael Shalayeff
@@ -42,7 +42,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <vm/vm.h>
#include <uvm/uvm.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c
index 14d3fa3b371..9be231ae4e7 100644
--- a/sys/dev/ic/tcic2.c
+++ b/sys/dev/ic/tcic2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcic2.c,v 1.1 2000/05/15 04:17:28 jason Exp $ */
+/* $OpenBSD: tcic2.c,v 1.2 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: tcic2.c,v 1.3 2000/01/13 09:38:17 joda Exp $ */
#undef TCICDEBUG
@@ -41,7 +41,7 @@
#include <sys/malloc.h>
#include <sys/kthread.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
#include <machine/intr.h>
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index c3f6d2917cd..13bac8fbd39 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc.c,v 1.42 2001/08/23 13:23:28 art Exp $ */
+/* $OpenBSD: wdc.c,v 1.43 2001/11/06 19:53:18 miod Exp $ */
/* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
@@ -77,7 +77,7 @@
#include <sys/syslog.h>
#include <sys/proc.h>
#include <sys/pool.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/intr.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index c22dbe2fae3..add5997203b 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xl.c,v 1.30 2001/08/19 18:07:33 jason Exp $ */
+/* $OpenBSD: xl.c,v 1.31 2001/11/06 19:53:18 miod Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -142,7 +142,7 @@
#include <net/bpf.h>
#endif
-#include <vm/vm.h> /* for vtophys */
+#include <uvm/uvm_extern.h> /* for vtophys */
#include <dev/ic/xlreg.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 10:48:24 +0000