[src/trunk]: src/sys/dev/ic remove include of <vm/vm.h>. <vm/vm.h> -> <uvm/uv...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72cc609dd884
branches:  trunk
changeset: 493993:72cc609dd884
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 28 17:12:48 2000 +0000

description:
remove include of <vm/vm.h>. <vm/vm.h> -> <uvm/uvm_extern.h>

diffstat:

 sys/dev/ic/adv.c         |  4 ++--
 sys/dev/ic/advlib.c      |  4 ++--
 sys/dev/ic/adw.c         |  4 ++--
 sys/dev/ic/adwlib.c      |  4 ++--
 sys/dev/ic/adwmcode.c    |  4 +---
 sys/dev/ic/aic7xxx.c     |  4 ++--
 sys/dev/ic/bha.c         |  4 ++--
 sys/dev/ic/bt463.c       |  5 +++--
 sys/dev/ic/bt485.c       |  5 +++--
 sys/dev/ic/elinkxl.c     |  4 +---
 sys/dev/ic/i82365.c      |  4 +---
 sys/dev/ic/i82557.c      |  4 ++--
 sys/dev/ic/isp_netbsd.h  |  4 +---
 sys/dev/ic/lemac.c       |  4 ++--
 sys/dev/ic/midway.c      |  6 +++++-
 sys/dev/ic/mpu.c         |  3 +--
 sys/dev/ic/pdq_ifsubr.c  |  4 +++-
 sys/dev/ic/pdqvar.h      |  3 +--
 sys/dev/ic/rrunner.c     |  4 +---
 sys/dev/ic/siop.c        |  4 +---
 sys/dev/ic/siop_common.c |  4 +---
 sys/dev/ic/tcic2.c       |  4 +---
 sys/dev/ic/tulip.c       |  4 ++--
 sys/dev/ic/wdc.c         |  4 +---
 24 files changed, 43 insertions(+), 55 deletions(-)

diffs (truncated from 436 to 300 lines):

diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/adv.c
--- a/sys/dev/ic/adv.c  Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/adv.c  Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adv.c,v 1.17 2000/06/26 14:38:50 mrg Exp $     */
+/*     $NetBSD: adv.c,v 1.18 2000/06/28 17:12:48 mrg Exp $     */
 
 /*
  * Generic driver for the Advanced Systems Inc. Narrow SCSI controllers
@@ -53,7 +53,7 @@
 #include <machine/bus.h>
 #include <machine/intr.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/advlib.c
--- a/sys/dev/ic/advlib.c       Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/advlib.c       Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: advlib.c,v 1.12 2000/06/26 14:38:50 mrg Exp $        */
+/*      $NetBSD: advlib.c,v 1.13 2000/06/28 17:12:49 mrg Exp $        */
 
 /*
  * Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -67,7 +67,7 @@
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/ic/advlib.h>
 #include <dev/ic/adv.h>
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/adw.c
--- a/sys/dev/ic/adw.c  Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/adw.c  Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: adw.c,v 1.24 2000/06/26 14:38:51 mrg Exp $  */
+/* $NetBSD: adw.c,v 1.25 2000/06/28 17:12:50 mrg Exp $  */
 
 /*
  * Generic driver for the Advanced Systems Inc. SCSI controllers
@@ -53,7 +53,7 @@
 #include <machine/bus.h>
 #include <machine/intr.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/adwlib.c
--- a/sys/dev/ic/adwlib.c       Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/adwlib.c       Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: adwlib.c,v 1.18 2000/06/26 14:38:51 mrg Exp $        */
+/* $NetBSD: adwlib.c,v 1.19 2000/06/28 17:12:50 mrg Exp $        */
 
 /*
  * Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -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/ic/adwmcode.h>
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/adwmcode.c
--- a/sys/dev/ic/adwmcode.c     Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/adwmcode.c     Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: adwmcode.c,v 1.6 2000/06/26 14:38:52 mrg Exp $        */
+/*      $NetBSD: adwmcode.c,v 1.7 2000/06/28 17:12:51 mrg Exp $        */
 
 /*
  * Generic driver definitions and exported functions for the Advanced
@@ -70,8 +70,6 @@
 #include <machine/bus.h>
 #include <machine/intr.h>
 
-#include <vm/vm.h>
-
 #include "adwmcode.h"
 
 /******************************************************************************/
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/aic7xxx.c
--- a/sys/dev/ic/aic7xxx.c      Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/aic7xxx.c      Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aic7xxx.c,v 1.57 2000/06/26 19:38:14 fvdl Exp $        */
+/*     $NetBSD: aic7xxx.c,v 1.58 2000/06/28 17:12:53 mrg Exp $ */
 
 /*
  * Generic driver for the aic7xxx based adaptec SCSI controllers
@@ -106,7 +106,7 @@
 #include <dev/scsipi/scsipi_debug.h>
 #include <dev/scsipi/scsiconf.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/ic/aic7xxxvar.h>
 #include <dev/microcode/aic7xxx/sequencer.h>
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/bha.c
--- a/sys/dev/ic/bha.c  Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/bha.c  Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bha.c,v 1.36 2000/03/30 12:45:30 augustss Exp $        */
+/*     $NetBSD: bha.c,v 1.37 2000/06/28 17:12:54 mrg Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 #include <sys/proc.h>
 #include <sys/user.h>
 
-#include <vm/vm.h>                     /* for PAGE_SIZE */
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/bt463.c
--- a/sys/dev/ic/bt463.c        Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/bt463.c        Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bt463.c,v 1.2 2000/06/13 17:21:06 nathanw Exp $ */
+/* $NetBSD: bt463.c,v 1.3 2000/06/28 17:12:55 mrg Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,8 @@
 #include <sys/buf.h>
 #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 -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/bt485.c
--- a/sys/dev/ic/bt485.c        Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/bt485.c        Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bt485.c,v 1.2 2000/04/02 18:55:01 nathanw Exp $ */
+/* $NetBSD: bt485.c,v 1.3 2000/06/28 17:12:56 mrg Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -37,7 +37,8 @@
 #include <sys/buf.h>
 #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 -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/elinkxl.c
--- a/sys/dev/ic/elinkxl.c      Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/elinkxl.c      Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elinkxl.c,v 1.35 2000/06/27 04:18:48 mrg Exp $ */
+/*     $NetBSD: elinkxl.c,v 1.36 2000/06/28 17:12:56 mrg Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -84,8 +84,6 @@
 #include <machine/intr.h>
 #include <machine/endian.h>
 
-#include <vm/vm.h>
-
 #include <dev/mii/miivar.h>
 #include <dev/mii/mii.h>
 #include <dev/mii/mii_bitbang.h>
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/i82365.c
--- a/sys/dev/ic/i82365.c       Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/i82365.c       Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82365.c,v 1.59 2000/04/03 01:55:25 cgd Exp $  */
+/*     $NetBSD: i82365.c,v 1.60 2000/06/28 17:12:56 mrg Exp $  */
 
 #define        PCICDEBUG
 
@@ -41,8 +41,6 @@
 #include <sys/malloc.h>
 #include <sys/kthread.h>
 
-#include <vm/vm.h>
-
 #include <machine/bus.h>
 #include <machine/intr.h>
 
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/i82557.c
--- a/sys/dev/ic/i82557.c       Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/i82557.c       Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82557.c,v 1.34 2000/05/29 17:37:13 jhawk Exp $        */
+/*     $NetBSD: i82557.c,v 1.35 2000/06/28 17:12:57 mrg Exp $  */
 
 /*-
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
 
 #include <machine/endian.h>
 
-#include <vm/vm.h>             /* for PAGE_SIZE */
+#include <uvm/uvm_extern.h>
 
 #if NRND > 0
 #include <sys/rnd.h>
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/isp_netbsd.h
--- a/sys/dev/ic/isp_netbsd.h   Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/isp_netbsd.h   Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_netbsd.h,v 1.24 2000/06/26 14:38:50 mrg Exp $ */
+/* $NetBSD: isp_netbsd.h,v 1.25 2000/06/28 17:12:58 mrg Exp $ */
 /*
  * NetBSD Specific definitions for the Qlogic ISP Host Adapter
  * Matthew Jacob <mjacob%nas.nasa.gov@localhost>
@@ -52,8 +52,6 @@
 #include <dev/scsipi/scsi_message.h>
 #include <dev/scsipi/scsipi_debug.h>
 
-#include <vm/vm.h>
-
 #include "opt_isp.h"
 
 #define        ISP_PLATFORM_VERSION_MAJOR      0
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/lemac.c
--- a/sys/dev/ic/lemac.c        Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/lemac.c        Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lemac.c,v 1.14 2000/05/12 16:45:42 thorpej Exp $ */
+/* $NetBSD: lemac.c,v 1.15 2000/06/28 17:12:58 mrg Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1997 Matt Thomas <matt%3am-software.com@localhost>
@@ -78,7 +78,7 @@
 #include <i386/isa/decether.h>
 #endif
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/midway.c
--- a/sys/dev/ic/midway.c       Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/midway.c       Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: midway.c,v 1.40 2000/04/12 10:36:45 itojun Exp $       */
+/*     $NetBSD: midway.c,v 1.41 2000/06/28 17:13:01 mrg Exp $  */
 /*     (sync'd to midway.c 1.68)       */
 
 /*
@@ -157,7 +157,11 @@
 #include <net/if.h>
 #include <net/if_atm.h>
 
+#ifdef __NetBSD__
+#include <uvm/uvm_extern.h>
+#else
 #include <vm/vm.h>
+#endif
 
 #if defined(INET) || defined(INET6)
 #include <netinet/in.h>
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/mpu.c
--- a/sys/dev/ic/mpu.c  Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/mpu.c  Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpu.c,v 1.3 1999/10/05 03:29:22 itohy Exp $    */
+/*     $NetBSD: mpu.c,v 1.4 2000/06/28 17:13:02 mrg Exp $      */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,6 @@
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
-#include <vm/vm.h>
 
 #include <machine/cpu.h>
 #include <machine/intr.h>
diff -r eb5b49db327a -r 72cc609dd884 sys/dev/ic/pdq_ifsubr.c
--- a/sys/dev/ic/pdq_ifsubr.c   Wed Jun 28 17:09:41 2000 +0000
+++ b/sys/dev/ic/pdq_ifsubr.c   Wed Jun 28 17:12:48 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pdq_ifsubr.c,v 1.27 2000/06/26 14:21:09 mrg Exp $      */
+/*     $NetBSD: pdq_ifsubr.c,v 1.28 2000/06/28 17:13:02 mrg Exp $      */
 
 /*-