Untangled the vm.h include file spaghetti.

6 files changed, 16 insertions, 9 deletions

diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index a44cbf2..5d9dbd3 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/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/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index fb46e28..68499f8 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.7 1995/11/29 14:39:06 julian Exp $
+ *  dgb.c $Id: dgb.c,v 1.8 1995/12/06 23:52:08 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -44,6 +44,8 @@
 #include <machine/clock.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 95a937c..844590e 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/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/dev/pci/pci.c b/sys/dev/pci/pci.c
index 13d53cc..c80da37 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/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/dev/si/si.c b/sys/dev/si/si.c
index 5e35245..1b732d9 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.20 1995/12/04 17:33:45 peter Exp $
+ *	$Id: si.c,v 1.21 1995/12/06 23:50:27 bde Exp $
  */
 
 #ifndef lint
@@ -57,6 +57,8 @@ static char si_copyright1[] =  "@(#) (C) Specialix International, 1990,1992",
 #include <machine/clock.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 
 #include <i386/isa/icu.h>
 #include <i386/isa/isa.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index a1c2796..6c736ca 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,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: syscons.c,v 1.132 1995/11/30 03:29:31 ache Exp $
+ *  $Id: syscons.c,v 1.133 1995/12/06 23:50:36 bde Exp $
  */
 
 #include "sc.h"
@@ -56,6 +56,8 @@
 #include <machine/random.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>