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

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

details:   https://anonhg.NetBSD.org/src/rev/4ca4eb2ffec3
branches:  trunk
changeset: 493987:4ca4eb2ffec3
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 28 16:08:42 2000 +0000

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

diffstat:

 sys/dev/pci/if_de.c         |   7 +++++--
 sys/dev/pci/if_fpa.c        |   5 ++---
 sys/dev/pci/if_le_pci.c     |   6 +-----
 sys/dev/pci/if_lmc.c        |   9 +++++++--
 sys/dev/pci/if_lmc_common.c |  10 +++++++---
 sys/dev/pci/if_lmc_media.c  |   6 +++---
 sys/dev/pci/if_lmc_nbsd.c   |   6 +++---
 sys/dev/pci/if_sip.c        |   4 ++--
 sys/dev/pci/if_tl.c         |   5 ++---
 sys/dev/pci/if_vr.c         |   4 ++--
 sys/dev/pci/ncr.c           |   8 +++++---
 sys/dev/pci/pci.c           |  28 +++++++++++++++++++++++++++-
 sys/dev/pci/pci_subr.c      |   8 ++++----
 sys/dev/pci/pciide.c        |   4 +---
 sys/dev/pci/pcivar.h        |  10 +++++++++-
 sys/dev/pci/tga.c           |   4 +---
 16 files changed, 81 insertions(+), 43 deletions(-)

diffs (truncated from 477 to 300 lines):

diff -r b9548ce0f2cd -r 4ca4eb2ffec3 sys/dev/pci/if_de.c
--- a/sys/dev/pci/if_de.c       Wed Jun 28 15:39:24 2000 +0000
+++ b/sys/dev/pci/if_de.c       Wed Jun 28 16:08:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_de.c,v 1.91 2000/06/26 14:21:11 mrg Exp $   */
+/*     $NetBSD: if_de.c,v 1.92 2000/06/28 16:08:42 mrg Exp $   */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt%3am-software.com@localhost)
@@ -99,9 +99,12 @@
 #include <netns/ns_if.h>
 #endif
 
-#include <vm/vm.h>
+#if defined(__NetBSD__)
+#include <uvm/uvm_extern.h>
+#endif
 
 #if defined(__FreeBSD__)
+#include <vm/vm.h>
 #include <vm/pmap.h>
 #include <pci.h>
 #include <netinet/if_ether.h>
diff -r b9548ce0f2cd -r 4ca4eb2ffec3 sys/dev/pci/if_fpa.c
--- a/sys/dev/pci/if_fpa.c      Wed Jun 28 15:39:24 2000 +0000
+++ b/sys/dev/pci/if_fpa.c      Wed Jun 28 16:08:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fpa.c,v 1.31 2000/06/26 14:21:11 mrg Exp $  */
+/*     $NetBSD: if_fpa.c,v 1.32 2000/06/28 16:08:43 mrg Exp $  */
 
 /*-
  * Copyright (c) 1995, 1996 Matt Thomas <matt%3am-software.com@localhost>
@@ -72,9 +72,8 @@
 #include <net/if_fddi.h>
 #endif
 
+#if defined(__FreeBSD__)
 #include <vm/vm.h>
-
-#if defined(__FreeBSD__)
 #include "fpa.h"
 #include <netinet/if_ether.h>
 #include <pci/pcivar.h>
diff -r b9548ce0f2cd -r 4ca4eb2ffec3 sys/dev/pci/if_le_pci.c
--- a/sys/dev/pci/if_le_pci.c   Wed Jun 28 15:39:24 2000 +0000
+++ b/sys/dev/pci/if_le_pci.c   Wed Jun 28 16:08:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_le_pci.c,v 1.27 2000/06/26 14:21:11 mrg Exp $       */
+/*     $NetBSD: if_le_pci.c,v 1.28 2000/06/28 16:08:44 mrg Exp $       */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -85,8 +85,6 @@
 #include <sys/socket.h>
 #include <sys/device.h>
 
-#include <vm/vm.h>
-
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
@@ -96,8 +94,6 @@
 #include <netinet/if_inarp.h>
 #endif
 
-#include <vm/vm.h>
-
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
diff -r b9548ce0f2cd -r 4ca4eb2ffec3 sys/dev/pci/if_lmc.c
--- a/sys/dev/pci/if_lmc.c      Wed Jun 28 15:39:24 2000 +0000
+++ b/sys/dev/pci/if_lmc.c      Wed Jun 28 16:08:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_lmc.c,v 1.4 2000/06/26 14:21:12 mrg Exp $   */
+/*     $NetBSD: if_lmc.c,v 1.5 2000/06/28 16:08:44 mrg Exp $   */
 
 /*-
  * Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@@ -96,7 +96,6 @@
 #include <net/bpfdesc.h>
 #endif
 
-#include <vm/vm.h>
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include <net/if_sppp.h>
@@ -117,7 +116,12 @@
 #include <net/if_c_hdlc.h>
 #endif
 
+#if defined(__NetBSD__)
+#include <uvm/uvm_extern.h>
+#endif
+
 #if defined(__FreeBSD__)
+#include <vm/vm.h>
 #include <vm/pmap.h>
 #include <pci.h>
 #if NPCI > 0
@@ -127,6 +131,7 @@
 #endif /* __FreeBSD__ */
 
 #if defined(__bsdi__)
+#include <vm/vm.h>
 #include <i386/pci/ic/dc21040.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/icu.h>
diff -r b9548ce0f2cd -r 4ca4eb2ffec3 sys/dev/pci/if_lmc_common.c
--- a/sys/dev/pci/if_lmc_common.c       Wed Jun 28 15:39:24 2000 +0000
+++ b/sys/dev/pci/if_lmc_common.c       Wed Jun 28 16:08:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_lmc_common.c,v 1.3 2000/06/26 14:21:12 mrg Exp $    */
+/*     $NetBSD: if_lmc_common.c,v 1.4 2000/06/28 16:08:44 mrg Exp $    */
 
 /*-
  * Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@@ -96,8 +96,6 @@
 #include <net/bpfdesc.h>
 #endif
 
-#include <vm/vm.h>
-
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include <net/if_sppp.h>
 #endif
@@ -117,7 +115,12 @@
 #include <net/if_c_hdlc.h>
 #endif
 
+#if defined(__NetBSD__)
+#include <uvm/uvm_extern.h>
+#endif
+
 #if defined(__FreeBSD__)
+#include <vm/vm.h>
 #include <vm/pmap.h>
 #include <pci.h>
 #if NPCI > 0
@@ -127,6 +130,7 @@
 #endif /* __FreeBSD__ */
 
 #if defined(__bsdi__)
+#include <vm/vm.h>
 #include <i386/pci/ic/dc21040.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/icu.h>
diff -r b9548ce0f2cd -r 4ca4eb2ffec3 sys/dev/pci/if_lmc_media.c
--- a/sys/dev/pci/if_lmc_media.c        Wed Jun 28 15:39:24 2000 +0000
+++ b/sys/dev/pci/if_lmc_media.c        Wed Jun 28 16:08:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_lmc_media.c,v 1.3 2000/06/26 14:21:12 mrg Exp $     */
+/*     $NetBSD: if_lmc_media.c,v 1.4 2000/06/28 16:08:45 mrg Exp $     */
 
 /*-
  * Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@@ -70,8 +70,6 @@
 #include <net/bpfdesc.h>
 #endif
 
-#include <vm/vm.h>
-
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include <net/if_sppp.h>
 #endif
@@ -92,6 +90,7 @@
 #endif
 
 #if defined(__FreeBSD__)
+#include <vm/vm.h>
 #include <vm/pmap.h>
 #include <pci.h>
 #if NPCI > 0
@@ -101,6 +100,7 @@
 #endif /* __FreeBSD__ */
 
 #if defined(__bsdi__)
+#include <vm/vm.h>
 #include <i386/pci/ic/dc21040.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/icu.h>
diff -r b9548ce0f2cd -r 4ca4eb2ffec3 sys/dev/pci/if_lmc_nbsd.c
--- a/sys/dev/pci/if_lmc_nbsd.c Wed Jun 28 15:39:24 2000 +0000
+++ b/sys/dev/pci/if_lmc_nbsd.c Wed Jun 28 16:08:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_lmc_nbsd.c,v 1.4 2000/06/26 14:21:12 mrg Exp $      */
+/*     $NetBSD: if_lmc_nbsd.c,v 1.5 2000/06/28 16:08:45 mrg Exp $      */
 
 /*-
  * Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@@ -96,8 +96,6 @@
 #include <net/bpfdesc.h>
 #endif
 
-#include <vm/vm.h>
-
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include <net/if_sppp.h>
 #endif
@@ -118,6 +116,7 @@
 #endif
 
 #if defined(__FreeBSD__)
+#include <vm/vm.h>
 #include <vm/pmap.h>
 #include <pci.h>
 #if NPCI > 0
@@ -127,6 +126,7 @@
 #endif /* __FreeBSD__ */
 
 #if defined(__bsdi__)
+#include <vm/vm.h>
 #include <i386/pci/ic/dc21040.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/icu.h>
diff -r b9548ce0f2cd -r 4ca4eb2ffec3 sys/dev/pci/if_sip.c
--- a/sys/dev/pci/if_sip.c      Wed Jun 28 15:39:24 2000 +0000
+++ b/sys/dev/pci/if_sip.c      Wed Jun 28 16:08:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_sip.c,v 1.11 2000/05/12 16:41:59 thorpej Exp $      */
+/*     $NetBSD: if_sip.c,v 1.12 2000/06/28 16:08:45 mrg Exp $  */
 
 /*-
  * Copyright (c) 1999 Network Computer, Inc.
@@ -52,7 +52,7 @@
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#include <vm/vm.h>             /* for PAGE_SIZE */
+#include <uvm/uvm_extern.h>            /* for PAGE_SIZE */
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff -r b9548ce0f2cd -r 4ca4eb2ffec3 sys/dev/pci/if_tl.c
--- a/sys/dev/pci/if_tl.c       Wed Jun 28 15:39:24 2000 +0000
+++ b/sys/dev/pci/if_tl.c       Wed Jun 28 16:08:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tl.c,v 1.33 2000/06/26 14:21:12 mrg Exp $   */
+/*     $NetBSD: if_tl.c,v 1.34 2000/06/28 16:08:46 mrg Exp $   */
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
@@ -83,10 +83,9 @@
 #include <netns/ns_if.h>
 #endif
 
-#include <vm/vm.h>
-
 #if defined(__NetBSD__)
 #include <net/if_ether.h>
+#include <uvm/uvm_extern.h>
 #if defined(INET)
 #include <netinet/if_inarp.h>
 #endif
diff -r b9548ce0f2cd -r 4ca4eb2ffec3 sys/dev/pci/if_vr.c
--- a/sys/dev/pci/if_vr.c       Wed Jun 28 15:39:24 2000 +0000
+++ b/sys/dev/pci/if_vr.c       Wed Jun 28 16:08:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vr.c,v 1.34 2000/03/23 07:01:39 thorpej Exp $       */
+/*     $NetBSD: if_vr.c,v 1.35 2000/06/28 16:08:46 mrg Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
 #include <sys/socket.h>
 #include <sys/device.h>
 
-#include <vm/vm.h>             /* for PAGE_SIZE */
+#include <uvm/uvm_extern.h>            /* for PAGE_SIZE */
 
 #include <net/if.h>
 #include <net/if_arp.h>
diff -r b9548ce0f2cd -r 4ca4eb2ffec3 sys/dev/pci/ncr.c
--- a/sys/dev/pci/ncr.c Wed Jun 28 15:39:24 2000 +0000
+++ b/sys/dev/pci/ncr.c Wed Jun 28 16:08:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr.c,v 1.102 2000/06/26 15:29:34 mrg Exp $    */
+/*     $NetBSD: ncr.c,v 1.103 2000/06/28 16:08:47 mrg Exp $    */
 
 /**************************************************************************
 **
@@ -220,8 +220,10 @@
 #include <sys/sysctl.h>
 #include <machine/clock.h>
 #endif
+#ifdef __NetBSD__
+#include <uvm/uvm_extern.h>
+#else
 #include <vm/vm.h>
-#ifndef __NetBSD__
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 #endif
@@ -1536,7 +1538,7 @@
 
 #if 0
 static char ident[] =
-       "\n$NetBSD: ncr.c,v 1.102 2000/06/26 15:29:34 mrg Exp $\n";
+       "\n$NetBSD: ncr.c,v 1.103 2000/06/28 16:08:47 mrg Exp $\n";
 #endif