Untangled the vm.h include file spaghetti.

7 files changed, 23 insertions, 11 deletions

diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index a44cbf2..5d9dbd3 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.37 1995/11/17 12:11:22 davidg Exp $
+ * $Id: if_de.c,v 1.38 1995/11/29 11:19:02 asami Exp $
  *
  */
 
@@ -82,8 +82,9 @@
 #endif
 
 #include <vm/vm.h>
-#include <vm/vm_kern.h>
 #include <vm/vm_param.h>
+#include <vm/pmap.h>
+#include <vm/vm_kern.h>
 
 #if defined(__FreeBSD__)
 #include <pci.h>
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index 95a937c..844590e 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.3 1995/12/05 02:01:51 davidg Exp $
+ *	$Id: if_fxp.c,v 1.4 1995/12/05 11:49:49 davidg Exp $
  */
 
 /*
@@ -76,7 +76,7 @@
 
 #include <vm/vm.h>		/* for vtophys */
 #include <vm/vm_param.h>	/* for vtophys */
-#include <machine/pmap.h>	/* for vtophys */
+#include <vm/pmap.h>		/* for vtophys */
 #include <machine/clock.h>	/* for DELAY */
 
 #include <pci/pcivar.h>
diff --git a/sys/pci/if_pdq.c b/sys/pci/if_pdq.c
index ef252cd..854ee91 100644
--- a/sys/pci/if_pdq.c
+++ b/sys/pci/if_pdq.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_pdq.c,v 1.9 1995/11/04 15:05:52 bde Exp $
+ * $Id: if_pdq.c,v 1.10 1995/12/05 02:01:53 davidg Exp $
  *
  */
 
@@ -87,7 +87,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_param.h>
 
 #if NFPA > 0
 #include <pci/pcivar.h>
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index bfaa826..b964503 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -65,6 +65,8 @@
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_param.h>
+#include <vm/pmap.h>
+#include <vm/vm_extern.h>
 
 #include <pci.h>
 #if NPCI > 0
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 7afa62f..093c156 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.48 1995/09/11 19:34:30 se Exp $
+**  $Id: ncr.c,v 1.49 1995/09/21 17:27:28 se Exp $
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
@@ -181,6 +181,8 @@
 #define bootverbose	1
 #endif
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 #include <vm/vm_extern.h>
 #endif /* KERNEL */
 
@@ -1251,7 +1253,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 
 static char ident[] =
-	"\n$Id: ncr.c,v 1.48 1995/09/11 19:34:30 se Exp $\n";
+	"\n$Id: ncr.c,v 1.49 1995/09/21 17:27:28 se Exp $\n";
 
 u_long	ncr_version = NCR_VERSION	* 11
 	+ (u_long) sizeof (struct ncb)	*  7
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 13d53cc..c80da37 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pci.c,v 1.34 1995/11/21 13:59:56 bde Exp $
+**  $Id: pci.c,v 1.35 1995/12/06 15:52:23 se Exp $
 **
 **  General subroutines for the PCI bus.
 **  pci_configure ()
@@ -59,8 +59,8 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
+#include <vm/pmap.h>
 
-#include <machine/pmap.h>
 #include <sys/devconf.h>
 
 #include <i386/isa/isa_device.h>	/* XXX inthand2_t */
diff --git a/sys/pci/pdq_os.h b/sys/pci/pdq_os.h
index 97bc73dc..60c4538 100644
--- a/sys/pci/pdq_os.h
+++ b/sys/pci/pdq_os.h
@@ -21,9 +21,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdq_os.h,v 1.3 1995/07/16 10:07:20 bde Exp $
+ * $Id: pdq_os.h,v 1.4 1995/10/29 15:33:36 phk Exp $
  *
  * $Log: pdq_os.h,v $
+ * Revision 1.4  1995/10/29  15:33:36  phk
+ * Second batch of cleanup changes.
+ * This time mostly making a lot of things static and some unused
+ * variables here and there.
+ *
  * Revision 1.3  1995/07/16  10:07:20  bde
  * Fix compiler warnings (systm.h wasn't included).
  *
@@ -76,7 +81,10 @@
 #endif
 #include <sys/malloc.h>
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_extern.h>
 
 #ifdef __FreeBSD__
 #include <machine/clock.h>