Untangled the vm.h include file spaghetti.

10 files changed, 64 insertions, 16 deletions

diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index 469364cb6614..690600f004e8 100644
--- a/sys/amd64/amd64/db_disasm.c
+++ b/sys/amd64/amd64/db_disasm.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_disasm.c,v 1.10 1995/10/29 15:29:48 phk Exp $
+ *	$Id: db_disasm.c,v 1.11 1995/10/30 17:13:25 bde Exp $
  */
 
 /*
@@ -32,6 +32,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <ddb/ddb.h>
 
 #include <ddb/db_access.h>
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index 2f458a8fc9c9..7536c1c419b1 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_interface.c,v 1.14 1995/05/30 07:59:22 rgrimes Exp $
+ *	$Id: db_interface.c,v 1.15 1995/11/18 06:49:35 bde Exp $
  */
 
 /*
@@ -40,10 +40,11 @@
 
 #include <machine/cons.h>	/* XXX: import cons_unavail */
 
-#include <ddb/ddb.h>
-
+#include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/pmap.h>
 
+#include <ddb/ddb.h>
 #include <setjmp.h>
 
 int	db_active = 0;
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 2d47b84cefe5..b0c77b0aa371 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.28 1995/08/17 11:29:55 davidg Exp $
+ *	$Id: genassym.c,v 1.29 1995/12/03 18:35:17 bde Exp $
  */
 
 #include <stdio.h>
@@ -57,7 +57,12 @@
 #include <machine/reg.h>
 #include <machine/bootinfo.h>
 #include <sys/syscall.h>
+#include <sys/vmmeter.h>
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/lock.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
 #include <sys/user.h>
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 6520a1697289..4717cc740289 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.153 1995/11/29 19:57:01 wollman Exp $
+ *	$Id: machdep.c,v 1.154 1995/12/04 16:47:40 phk Exp $
  */
 
 #include "npx.h"
@@ -47,7 +47,6 @@
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
@@ -62,6 +61,7 @@
 #include <sys/tty.h>
 #include <sys/sysctl.h>
 #include <sys/devconf.h>
+#include <sys/vmmeter.h>
 
 #ifdef SYSVSHM
 #include <sys/shm.h>
@@ -76,10 +76,17 @@
 #endif
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
+#include <vm/vm_map.h>
 #include <vm/vm_pager.h>
+#include <vm/vm_extern.h>
 
+#include <sys/user.h>
 #include <sys/exec.h>
 #include <sys/vnode.h>
 
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index a444ed62f3c0..5fb364e4b3e2 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.20 1995/11/29 10:47:18 julian Exp $
+ *	$Id: mem.c,v 1.21 1995/11/29 14:39:26 julian Exp $
  */
 
 /*
@@ -62,6 +62,7 @@
 #include <vm/lock.h>
 #include <vm/vm_prot.h>
 #include <vm/pmap.h>
+#include <vm/vm_extern.h>
 
 #ifdef JREMOD
 #include <sys/kernel.h>
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 3ef2d87dae7e..e89ef2da649b 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.65 1995/11/20 12:10:01 phk Exp $
+ *	$Id: pmap.c,v 1.66 1995/12/03 18:35:28 bde Exp $
  */
 
 /*
@@ -89,13 +89,20 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
-#include <sys/user.h>
 #include <sys/msgbuf.h>
+#include <sys/queue.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
+#include <vm/vm_map.h>
+#include <vm/vm_object.h>
+#include <vm/vm_extern.h>
 
+#include <machine/pcb.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index ca6dcc91c942..686d33dd76c6 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id$
+ *	$Id: sys_machdep.c,v 1.11 1995/11/12 07:10:47 bde Exp $
  *
  */
 
@@ -39,6 +39,15 @@
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/proc.h>
+
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
+#include <vm/vm_extern.h>
+
 #include <sys/user.h>
 
 #include <machine/cpu.h>
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 1b92567c9e48..5c8a647dec7f 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.61 1995/10/09 04:36:01 bde Exp $
+ *	$Id: trap.c,v 1.62 1995/10/28 15:38:32 phk Exp $
  */
 
 /*
@@ -45,20 +45,27 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/acct.h>
 #include <sys/kernel.h>
 #include <sys/syscall.h>
 #include <sys/sysent.h>
+#include <sys/queue.h>
+#include <sys/vmmeter.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
 
+#include <vm/vm.h>
 #include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
+#include <vm/vm_extern.h>
+
+#include <sys/user.h>
 
 #include <machine/cpu.h>
 #include <machine/md_var.h>
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 6e2a520a6011..9779f11e67bf 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.44 1995/11/18 06:54:11 bde Exp $
+ *	$Id: vm_machdep.c,v 1.45 1995/11/20 12:10:09 phk Exp $
  */
 
 #include "npx.h"
@@ -48,15 +48,22 @@
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
-#include <sys/user.h>
+#include <sys/vmmeter.h>
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/md_var.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
+#include <vm/vm_map.h>
+#include <vm/vm_extern.h>
+
+#include <sys/user.h>
 
 #include <i386/isa/isa.h>
 
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 503d0d4a825d..e04a500b5b29 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/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>