Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mrg 2000-06-28 16:08:42 +00:00
parent 13f211c52e
commit 7c15053eed
16 changed files with 81 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/pci/if_de.c
View File

@ -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) * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -99,9 +99,12 @@
#include <netns/ns_if.h> #include <netns/ns_if.h>
#endif #endif
#include <vm/vm.h> #if defined(__NetBSD__)
#include <uvm/uvm_extern.h>
#endif
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
#include <vm/vm.h>
#include <vm/pmap.h> #include <vm/pmap.h>
#include <pci.h> #include <pci.h>
#include <netinet/if_ether.h> #include <netinet/if_ether.h>

5
sys/dev/pci/if_fpa.c
View File

@ -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> * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@ -72,9 +72,8 @@
#include <net/if_fddi.h> #include <net/if_fddi.h>
#endif #endif
#include <vm/vm.h>
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
#include <vm/vm.h>
#include "fpa.h" #include "fpa.h"
#include <netinet/if_ether.h> #include <netinet/if_ether.h>
#include <pci/pcivar.h> #include <pci/pcivar.h>

6
sys/dev/pci/if_le_pci.c
View File

@ -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. * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -85,8 +85,6 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/device.h> #include <sys/device.h>
#include <vm/vm.h>
#include <net/if.h> #include <net/if.h>
#include <net/if_ether.h> #include <net/if_ether.h>
#include <net/if_media.h> #include <net/if_media.h>
@ -96,8 +94,6 @@
#include <netinet/if_inarp.h> #include <netinet/if_inarp.h>
#endif #endif
#include <vm/vm.h>
#include <machine/cpu.h> #include <machine/cpu.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <machine/intr.h> #include <machine/intr.h>

9
sys/dev/pci/if_lmc.c
View File

@ -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) * Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@ -96,7 +96,6 @@
#include <net/bpfdesc.h> #include <net/bpfdesc.h>
#endif #endif
#include <vm/vm.h>
#if defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__FreeBSD__) || defined(__NetBSD__)
#include <net/if_sppp.h> #include <net/if_sppp.h>
@ -117,7 +116,12 @@
#include <net/if_c_hdlc.h> #include <net/if_c_hdlc.h>
#endif #endif
#if defined(__NetBSD__)
#include <uvm/uvm_extern.h>
#endif
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
#include <vm/vm.h>
#include <vm/pmap.h> #include <vm/pmap.h>
#include <pci.h> #include <pci.h>
#if NPCI > 0 #if NPCI > 0
@ -127,6 +131,7 @@
#endif /* __FreeBSD__ */ #endif /* __FreeBSD__ */
#if defined(__bsdi__) #if defined(__bsdi__)
#include <vm/vm.h>
#include <i386/pci/ic/dc21040.h> #include <i386/pci/ic/dc21040.h>
#include <i386/isa/isa.h> #include <i386/isa/isa.h>
#include <i386/isa/icu.h> #include <i386/isa/icu.h>

10
sys/dev/pci/if_lmc_common.c
View File

@ -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) * Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@ -96,8 +96,6 @@
#include <net/bpfdesc.h> #include <net/bpfdesc.h>
#endif #endif
#include <vm/vm.h>
#if defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__FreeBSD__) || defined(__NetBSD__)
#include <net/if_sppp.h> #include <net/if_sppp.h>
#endif #endif
@ -117,7 +115,12 @@
#include <net/if_c_hdlc.h> #include <net/if_c_hdlc.h>
#endif #endif
#if defined(__NetBSD__)
#include <uvm/uvm_extern.h>
#endif
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
#include <vm/vm.h>
#include <vm/pmap.h> #include <vm/pmap.h>
#include <pci.h> #include <pci.h>
#if NPCI > 0 #if NPCI > 0
@ -127,6 +130,7 @@
#endif /* __FreeBSD__ */ #endif /* __FreeBSD__ */
#if defined(__bsdi__) #if defined(__bsdi__)
#include <vm/vm.h>
#include <i386/pci/ic/dc21040.h> #include <i386/pci/ic/dc21040.h>
#include <i386/isa/isa.h> #include <i386/isa/isa.h>
#include <i386/isa/icu.h> #include <i386/isa/icu.h>

6
sys/dev/pci/if_lmc_media.c
View File

@ -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) * Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@ -70,8 +70,6 @@
#include <net/bpfdesc.h> #include <net/bpfdesc.h>
#endif #endif
#include <vm/vm.h>
#if defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__FreeBSD__) || defined(__NetBSD__)
#include <net/if_sppp.h> #include <net/if_sppp.h>
#endif #endif
@ -92,6 +90,7 @@
#endif #endif
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
#include <vm/vm.h>
#include <vm/pmap.h> #include <vm/pmap.h>
#include <pci.h> #include <pci.h>
#if NPCI > 0 #if NPCI > 0
@ -101,6 +100,7 @@
#endif /* __FreeBSD__ */ #endif /* __FreeBSD__ */
#if defined(__bsdi__) #if defined(__bsdi__)
#include <vm/vm.h>
#include <i386/pci/ic/dc21040.h> #include <i386/pci/ic/dc21040.h>
#include <i386/isa/isa.h> #include <i386/isa/isa.h>
#include <i386/isa/icu.h> #include <i386/isa/icu.h>

6
sys/dev/pci/if_lmc_nbsd.c
View File

@ -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) * Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@ -96,8 +96,6 @@
#include <net/bpfdesc.h> #include <net/bpfdesc.h>
#endif #endif
#include <vm/vm.h>
#if defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__FreeBSD__) || defined(__NetBSD__)
#include <net/if_sppp.h> #include <net/if_sppp.h>
#endif #endif
@ -118,6 +116,7 @@
#endif #endif
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
#include <vm/vm.h>
#include <vm/pmap.h> #include <vm/pmap.h>
#include <pci.h> #include <pci.h>
#if NPCI > 0 #if NPCI > 0
@ -127,6 +126,7 @@
#endif /* __FreeBSD__ */ #endif /* __FreeBSD__ */
#if defined(__bsdi__) #if defined(__bsdi__)
#include <vm/vm.h>
#include <i386/pci/ic/dc21040.h> #include <i386/pci/ic/dc21040.h>
#include <i386/isa/isa.h> #include <i386/isa/isa.h>
#include <i386/isa/icu.h> #include <i386/isa/icu.h>

4
sys/dev/pci/if_sip.c
View File

@ -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. * Copyright (c) 1999 Network Computer, Inc.
@ -52,7 +52,7 @@
#include <sys/device.h> #include <sys/device.h>
#include <sys/queue.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.h>
#include <net/if_dl.h> #include <net/if_dl.h>

5
sys/dev/pci/if_tl.c
View File

@ -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. * Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@ -83,10 +83,9 @@
#include <netns/ns_if.h> #include <netns/ns_if.h>
#endif #endif
#include <vm/vm.h>
#if defined(__NetBSD__) #if defined(__NetBSD__)
#include <net/if_ether.h> #include <net/if_ether.h>
#include <uvm/uvm_extern.h>
#if defined(INET) #if defined(INET)
#include <netinet/if_inarp.h> #include <netinet/if_inarp.h>
#endif #endif

4
sys/dev/pci/if_vr.c
View File

@ -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. * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -115,7 +115,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/device.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.h>
#include <net/if_arp.h> #include <net/if_arp.h>

8
sys/dev/pci/ncr.c
View File

@ -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 <sys/sysctl.h>
#include <machine/clock.h> #include <machine/clock.h>
#endif #endif
#ifdef __NetBSD__
#include <uvm/uvm_extern.h>
#else
#include <vm/vm.h> #include <vm/vm.h>
#ifndef __NetBSD__
#include <vm/pmap.h> #include <vm/pmap.h>
#include <vm/vm_extern.h> #include <vm/vm_extern.h>
#endif #endif
@ -1536,7 +1538,7 @@ static int read_tekram_eeprom
#if 0 #if 0
static char ident[] = 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 #endif
static const u_long ncr_version = NCR_VERSION * 11 static const u_long ncr_version = NCR_VERSION * 11

28
sys/dev/pci/pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci.c,v 1.48 2000/05/10 08:39:58 kleink Exp $ */ /* $NetBSD: pci.c,v 1.49 2000/06/28 16:08:48 mrg Exp $ */
/* /*
* Copyright (c) 1995, 1996, 1997, 1998 * Copyright (c) 1995, 1996, 1997, 1998
@ -63,13 +63,20 @@ struct pci_softc {
u_int sc_intrswiz; u_int sc_intrswiz;
pcitag_t sc_intrtag; pcitag_t sc_intrtag;
int sc_flags; int sc_flags;
#ifdef __PCI_OFW_BINDING
int sc_node;
#endif
}; };
struct cfattach pci_ca = { struct cfattach pci_ca = {
sizeof(struct pci_softc), pcimatch, pciattach sizeof(struct pci_softc), pcimatch, pciattach
}; };
#ifdef __PCI_OFW_BINDING
void pci_ofw_probe_bus __P((struct device *));
#else
void pci_probe_bus __P((struct device *)); void pci_probe_bus __P((struct device *));
#endif
int pciprint __P((void *, const char *)); int pciprint __P((void *, const char *));
int pcisubmatch __P((struct device *, struct cfdata *, void *)); int pcisubmatch __P((struct device *, struct cfdata *, void *));
@ -126,6 +133,19 @@ pcimatch(parent, cf, aux)
return 1; return 1;
} }
#ifdef __PCI_OFW_BINDING
void
pci_ofw_probe_bus(self)
struct device *self;
{
struct pci_softc *sc = (struct pci_softc *)self;
int node;
for (node = OF_child(sc->sc_node); node; node = OF_peer(node)) {
}
}
#else
void void
pci_probe_bus(self) pci_probe_bus(self)
struct device *self; struct device *self;
@ -228,6 +248,7 @@ pci_probe_bus(self)
} }
} }
} }
#endif
void void
pciattach(parent, self, aux) pciattach(parent, self, aux)
@ -286,8 +307,13 @@ pciattach(parent, self, aux)
sc->sc_intrswiz = pba->pba_intrswiz; sc->sc_intrswiz = pba->pba_intrswiz;
sc->sc_intrtag = pba->pba_intrtag; sc->sc_intrtag = pba->pba_intrtag;
sc->sc_flags = pba->pba_flags; sc->sc_flags = pba->pba_flags;
#ifdef __PCI_OFW_BINDING
sc->sc_node = pba->pba_node;
pci_ofw_probe_bus(self);
#else
pci_probe_bus(self); pci_probe_bus(self);
#endif
} }
int int

8
sys/dev/pci/pci_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_subr.c,v 1.35 2000/03/22 00:36:29 cgd Exp $ */ /* $NetBSD: pci_subr.c,v 1.36 2000/06/28 16:08:49 mrg Exp $ */
/* /*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved. * Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@ -685,7 +685,7 @@ pci_conf_print_type0(pc, tag, regs)
printf("(pin D)"); printf("(pin D)");
break; break;
default: default:
printf("(???)"); printf("(? ? ?)");
break; break;
} }
printf("\n"); printf("\n");
@ -839,7 +839,7 @@ pci_conf_print_type1(pc, tag, regs)
printf("(pin D)"); printf("(pin D)");
break; break;
default: default:
printf("(???)"); printf("(? ? ?)");
break; break;
} }
printf("\n"); printf("\n");
@ -952,7 +952,7 @@ pci_conf_print_type2(pc, tag, regs)
printf("(pin D)"); printf("(pin D)");
break; break;
default: default:
printf("(???)"); printf("(? ? ?)");
break; break;
} }
printf("\n"); printf("\n");

4
sys/dev/pci/pciide.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pciide.c,v 1.72 2000/06/27 05:57:05 tron Exp $ */ /* $NetBSD: pciide.c,v 1.73 2000/06/28 16:08:49 mrg Exp $ */
/* /*
@ -98,8 +98,6 @@ int wdcdebug_pciide_mask = 0;
#include <machine/endian.h> #include <machine/endian.h>
#include <vm/vm.h>
#include <dev/pci/pcireg.h> #include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h> #include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h> #include <dev/pci/pcidevs.h>

10
sys/dev/pci/pcivar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcivar.h,v 1.42 2000/05/10 16:58:42 thorpej Exp $ */ /* $NetBSD: pcivar.h,v 1.43 2000/06/28 16:08:50 mrg Exp $ */
/* /*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -68,6 +68,10 @@ struct pcibus_attach_args {
int pba_bus; /* PCI bus number */ int pba_bus; /* PCI bus number */
#ifdef __PCI_OFW_BINDING
int pba_node; /* OFW node */
#endif
/* /*
* Interrupt swizzling information. These fields * Interrupt swizzling information. These fields
* are only used by secondary busses. * are only used by secondary busses.
@ -91,6 +95,10 @@ struct pci_attach_args {
pcitag_t pa_tag; pcitag_t pa_tag;
pcireg_t pa_id, pa_class; pcireg_t pa_id, pa_class;
#ifdef __PCI_OFW_BINDING
int pa_node; /* OFW node */
#endif
/* /*
* Interrupt information. * Interrupt information.
* *

4
sys/dev/pci/tga.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tga.c,v 1.26 2000/06/26 04:56:25 simonb Exp $ */ /* $NetBSD: tga.c,v 1.27 2000/06/28 16:08:50 mrg Exp $ */
/* /*
* Copyright (c) 1995, 1996 Carnegie-Mellon University. * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -36,8 +36,6 @@
#include <sys/buf.h> #include <sys/buf.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <vm/vm.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <machine/intr.h> #include <machine/intr.h>