Untangled the vm.h include file spaghetti.

14 files changed, 41 insertions, 10 deletions

diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 9230a68..9f79dd6 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: aha1542.c,v 1.50 1995/11/04 17:07:00 bde Exp $
+ *      $Id: aha1542.c,v 1.51 1995/12/06 23:50:45 bde Exp $
  */
 
 /*
@@ -35,6 +35,8 @@
 #include <machine/cpu.h>	/* XXX for bootverbose: a funny place */
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 
 #include <i386/isa/isa_device.h>
 #endif	/* KERNEL */
diff --git a/sys/i386/isa/bt742a.c b/sys/i386/isa/bt742a.c
index a092cea..329ab87 100644
--- a/sys/i386/isa/bt742a.c
+++ b/sys/i386/isa/bt742a.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: bt742a.c,v 1.44 1995/12/06 23:50:06 bde Exp $
+ *      $Id: bt742a.c,v 1.45 1995/12/07 09:13:48 peter Exp $
  */
 
 /*
@@ -50,6 +50,8 @@
 #include <machine/clock.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 
 #include <i386/isa/isa_device.h>
 #include <scsi/scsi_all.h>
diff --git a/sys/i386/isa/cronyx.c b/sys/i386/isa/cronyx.c
index c782557..c5ed8f4 100644
--- a/sys/i386/isa/cronyx.c
+++ b/sys/i386/isa/cronyx.c
@@ -30,6 +30,8 @@
 #   include <sys/socket.h>
 #   include <net/if.h>
 #   include <vm/vm.h>
+#   include <vm/vm_param.h>
+#   include <vm/pmap.h>
 #   ifndef __FreeBSD__
 #      include <machine/inline.h>
 #   endif
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 2e38218..241f47c 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.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_le.c,v 1.23 1995/11/04 17:07:33 bde Exp $
+ * $Id: if_le.c,v 1.24 1995/12/05 02:01:13 davidg Exp $
  */
 
 /*
@@ -82,6 +82,8 @@
 #include <i386/isa/icu.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 503d0d4..e04a500 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.56 1995/11/20 12:41:44 phk Exp $
+ *	$Id: isa.c,v 1.57 1995/11/20 13:24:18 bde Exp $
  */
 
 /*
@@ -61,6 +61,8 @@
 #include <sys/rlist.h>
 #include <machine/segments.h>
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 #include <machine/spl.h>
 #include <machine/cpu.h>
 #include <i386/isa/isa_device.h>
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 3c5c0f4..3c0b4b4 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.43 1995/12/02 20:33:40 phk Exp $
+ *	$Id: lpt.c,v 1.44 1995/12/06 23:50:14 bde Exp $
  */
 
 /*
@@ -118,6 +118,8 @@
 #include <machine/lpt.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/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 65aa098..57848cc 100644
--- a/sys/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/i386/isa/pcvt/pcvt_hdr.h
@@ -169,6 +169,9 @@
 #include <machine/clock.h>
 #include <machine/md_var.h>
 #endif
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 #else /* PCVT_FREEBSD >= 200 */
 #include "machine/pc/display.h"
 #endif /* PCVT_FREEBSD >= 200 */
diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c
index eaf6142..76a5215 100644
--- a/sys/i386/isa/seagate.c
+++ b/sys/i386/isa/seagate.c
@@ -60,7 +60,7 @@
  *               that category, with the possible exception of scanners and
  *               some of the older MO drives.
  *
- * $Id: seagate.c,v 1.12 1995/11/04 17:07:44 bde Exp $
+ * $Id: seagate.c,v 1.13 1995/12/06 23:50:20 bde Exp $
  */
 
 /*
@@ -126,6 +126,8 @@
 #include <machine/clock.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 
 #include <i386/isa/isa_device.h>
 
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 5e35245..1b732d9 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/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/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h
index ad5b98e..69c641e 100644
--- a/sys/i386/isa/sound/os.h
+++ b/sys/i386/isa/sound/os.h
@@ -32,6 +32,9 @@
 #include <sys/buf.h>
 #include <i386/isa/isa_device.h>
 #include <machine/cpufunc.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 
 /* These few lines are used by 386BSD (only??). */
 
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index a1c2796..6c736ca 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/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>
diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c
index 15d665f..ca7b7e2 100644
--- a/sys/i386/isa/ultra14f.c
+++ b/sys/i386/isa/ultra14f.c
@@ -22,7 +22,7 @@
  * today: Fri Jun  2 17:21:03 EST 1994
  * added 24F support  ++sg
  *
- *      $Id: ultra14f.c,v 1.39 1995/11/14 09:53:17 phk Exp $
+ *      $Id: ultra14f.c,v 1.40 1995/12/06 23:50:39 bde Exp $
  */
 
 #include <sys/types.h>
@@ -42,6 +42,8 @@
 #include <machine/clock.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 
 #include <i386/isa/isa_device.h>
 #endif /*KERNEL */
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index af05ceb..354b0bb 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.94 1995/11/29 10:48:01 julian Exp $
+ *	$Id: wd.c,v 1.95 1995/11/29 14:40:08 julian Exp $
  */
 
 /* TODO:
@@ -88,6 +88,9 @@
 #include <sys/syslog.h>
 #include <sys/dkstat.h>
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/pmap.h>
 
 #ifdef ATAPI
 #include <i386/isa/atapi.h>
diff --git a/sys/i386/isa/wd7000.c b/sys/i386/isa/wd7000.c
index dea8262..b716d54 100644
--- a/sys/i386/isa/wd7000.c
+++ b/sys/i386/isa/wd7000.c
@@ -68,6 +68,8 @@
 #include <machine/cpu.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
 
 #include <i386/isa/isa_device.h>