From 314f1e97c5d823cfe9824de6a1076c0c63259c79 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Wed, 28 Jun 2000 17:12:48 +0000
Subject: [PATCH] remove include of <vm/vm.h>. <vm/vm.h> -> <uvm/uvm_extern.h>

---
 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(-)

diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index 8799af76b0ab..e13afb42b5b1 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -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 --git a/sys/dev/ic/advlib.c b/sys/dev/ic/advlib.c
index 4d580b88211c..f9bf6e768d11 100644
--- a/sys/dev/ic/advlib.c
+++ b/sys/dev/ic/advlib.c
@@ -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 --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index c5e212f4808d..a4e6b527e2b0 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -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 --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c
index e072aef3d466..295d8d704a45 100644
--- a/sys/dev/ic/adwlib.c
+++ b/sys/dev/ic/adwlib.c
@@ -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 --git a/sys/dev/ic/adwmcode.c b/sys/dev/ic/adwmcode.c
index cbe39753f2f2..d8b07d570d12 100644
--- a/sys/dev/ic/adwmcode.c
+++ b/sys/dev/ic/adwmcode.c
@@ -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 --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 138ae4f8c7fb..25d55c30b21d 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -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 --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index d8a7ad1ce683..cc9ff429dcb1 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -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 --git a/sys/dev/ic/bt463.c b/sys/dev/ic/bt463.c
index 543e07d832d8..2b2d42fbb4ee 100644
--- a/sys/dev/ic/bt463.c
+++ b/sys/dev/ic/bt463.c
@@ -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 --git a/sys/dev/ic/bt485.c b/sys/dev/ic/bt485.c
index 8e22e0f9a4ea..42628e012d3c 100644
--- a/sys/dev/ic/bt485.c
+++ b/sys/dev/ic/bt485.c
@@ -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 --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c
index d3b30ad07317..cd78c44a702c 100644
--- a/sys/dev/ic/elinkxl.c
+++ b/sys/dev/ic/elinkxl.c
@@ -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 --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c
index 0447dbd2d875..355307a12e0c 100644
--- a/sys/dev/ic/i82365.c
+++ b/sys/dev/ic/i82365.c
@@ -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 --git a/sys/dev/ic/i82557.c b/sys/dev/ic/i82557.c
index 4b177eadae37..0db5e8afad03 100644
--- a/sys/dev/ic/i82557.c
+++ b/sys/dev/ic/i82557.c
@@ -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 --git a/sys/dev/ic/isp_netbsd.h b/sys/dev/ic/isp_netbsd.h
index ff4047f570f1..67e9698aca3d 100644
--- a/sys/dev/ic/isp_netbsd.h
+++ b/sys/dev/ic/isp_netbsd.h
@@ -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>
@@ -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 --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c
index a7ee32f3b8c4..16284d9687ce 100644
--- a/sys/dev/ic/lemac.c
+++ b/sys/dev/ic/lemac.c
@@ -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>
@@ -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 --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c
index 7786d7ca55f3..0735e55b31cf 100644
--- a/sys/dev/ic/midway.c
+++ b/sys/dev/ic/midway.c
@@ -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 --git a/sys/dev/ic/mpu.c b/sys/dev/ic/mpu.c
index 63b34797a862..4262adb265fc 100644
--- a/sys/dev/ic/mpu.c
+++ b/sys/dev/ic/mpu.c
@@ -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 --git a/sys/dev/ic/pdq_ifsubr.c b/sys/dev/ic/pdq_ifsubr.c
index 26c6abde4018..c38d836edab5 100644
--- a/sys/dev/ic/pdq_ifsubr.c
+++ b/sys/dev/ic/pdq_ifsubr.c
@@ -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 $	*/
 
 /*-
  * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -92,7 +92,9 @@
 #include <netns/ns_if.h>
 #endif
 
+#ifndef __NetBSD__
 #include <vm/vm.h>
+#endif
 
 #if defined(__FreeBSD__)
 /*
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h
index 94259a542e8e..0c91ba71832e 100644
--- a/sys/dev/ic/pdqvar.h
+++ b/sys/dev/ic/pdqvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pdqvar.h,v 1.28 2000/06/26 14:21:10 mrg Exp $	*/
+/*	$NetBSD: pdqvar.h,v 1.29 2000/06/28 17:13:02 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -68,7 +68,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>
 
diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c
index 3fbe0635db7b..84a649b6f31a 100644
--- a/sys/dev/ic/rrunner.c
+++ b/sys/dev/ic/rrunner.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rrunner.c,v 1.17 2000/06/26 04:56:19 simonb Exp $	*/
+/*	$NetBSD: rrunner.c,v 1.18 2000/06/28 17:13:03 mrg Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -60,8 +60,6 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index ab0dd8fc0d5d..ffa0fc1e6b7c 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop.c,v 1.23 2000/06/26 14:21:10 mrg Exp $	*/
+/*	$NetBSD: siop.c,v 1.24 2000/06/28 17:13:04 mrg Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -42,8 +42,6 @@
 #include <machine/endian.h>
 #include <machine/bus.h>
 
-#include <vm/vm.h>
-
 #include <dev/microcode/siop/siop.out>
 
 #include <dev/scsipi/scsi_all.h>
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index 913f864ce264..b860a91d16ad 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop_common.c,v 1.4 2000/06/26 14:21:10 mrg Exp $	*/
+/*	$NetBSD: siop_common.c,v 1.5 2000/06/28 17:13:04 mrg Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -43,8 +43,6 @@
 #include <machine/endian.h>
 #include <machine/bus.h>
 
-#include <vm/vm.h>
-
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsi_message.h>
 #include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c
index a58298835a73..e6c4bb8e64c7 100644
--- a/sys/dev/ic/tcic2.c
+++ b/sys/dev/ic/tcic2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcic2.c,v 1.5 2000/06/16 23:41:34 cgd Exp $	*/
+/*	$NetBSD: tcic2.c,v 1.6 2000/06/28 17:13:04 mrg Exp $	*/
 
 #undef	TCICDEBUG
 
@@ -40,8 +40,6 @@
 #include <sys/malloc.h>
 #include <sys/kthread.h>
 
-#include <vm/vm.h>
-
 #include <machine/bus.h>
 #include <machine/intr.h>
 
diff --git a/sys/dev/ic/tulip.c b/sys/dev/ic/tulip.c
index 7a9c6fd9d460..5d56eb59543e 100644
--- a/sys/dev/ic/tulip.c
+++ b/sys/dev/ic/tulip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tulip.c,v 1.68 2000/05/26 16:38:13 thorpej Exp $	*/
+/*	$NetBSD: tulip.c,v 1.69 2000/06/28 17:13:05 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
 
 #include <machine/endian.h>
 
-#include <vm/vm.h>		/* for PAGE_SIZE */
+#include <uvm/uvm_extern.h>
  
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index f1e0076993b8..8757aece1fbd 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc.c,v 1.91 2000/06/12 21:10:41 bouyer Exp $ */
+/*	$NetBSD: wdc.c,v 1.92 2000/06/28 17:13:06 mrg Exp $ */
 
 
 /*
@@ -86,8 +86,6 @@
 #include <sys/syslog.h>
 #include <sys/proc.h>
 
-#include <vm/vm.h>
-
 #include <machine/intr.h>
 #include <machine/bus.h>