useracc() the prequel:

Merge the contents (less some trivial bordering the silly comments)
of <vm/vm_prot.h> and <vm/vm_inherit.h> into <vm/vm.h>.  This puts
the #defines for the vm_inherit_t and vm_prot_t types next to their
typedefs.

This paves the road for the commit to follow shortly: change
useracc() to use VM_PROT_{READ|WRITE} rather than B_{READ|WRITE}
as argument.

17 files changed, 6 insertions, 15 deletions

diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c
index cfc8115..d01433b 100644
--- a/sys/alpha/alpha/busdma_machdep.c
+++ b/sys/alpha/alpha/busdma_machdep.c
@@ -31,7 +31,6 @@
 #include <sys/malloc.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 
 #include <machine/bus.h>
diff --git a/sys/alpha/alpha/fp_emulate.c b/sys/alpha/alpha/fp_emulate.c
index ad07a8e..3b8d6dc 100644
--- a/sys/alpha/alpha/fp_emulate.c
+++ b/sys/alpha/alpha/fp_emulate.c
@@ -34,7 +34,6 @@
 #include <sys/lock.h>
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 1d6f2ae..27c6cf3 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -115,7 +115,6 @@
 #include <net/netisr.h>
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c
index 35a2773..ce09425 100644
--- a/sys/alpha/alpha/mem.c
+++ b/sys/alpha/alpha/mem.c
@@ -64,7 +64,6 @@
 #endif
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index 411b4a4..5fca8b3 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -159,7 +159,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
diff --git a/sys/alpha/alpha/prom.c b/sys/alpha/alpha/prom.c
index ddb4679..e677e7d 100644
--- a/sys/alpha/alpha/prom.c
+++ b/sys/alpha/alpha/prom.c
@@ -23,6 +23,8 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
+ *
+ * $FreeBSD$
  */
 
 #include "opt_simos.h"
@@ -38,7 +40,6 @@
 #include <sys/lock.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_map.h>
 #include <sys/proc.h>
 #include <sys/user.h>
diff --git a/sys/alpha/alpha/prom_disp.s b/sys/alpha/alpha/prom_disp.s
index 23bdbef..0c548b4 100644
--- a/sys/alpha/alpha/prom_disp.s
+++ b/sys/alpha/alpha/prom_disp.s
@@ -25,6 +25,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $FreeBSD$
  */
 
 #ifndef _LOCORE
diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index 8b4d3b1..649df02 100644
--- a/sys/alpha/alpha/promcons.c
+++ b/sys/alpha/alpha/promcons.c
@@ -40,7 +40,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
diff --git a/sys/alpha/alpha/sgmap.c b/sys/alpha/alpha/sgmap.c
index 94517e7..cd20a4a 100644
--- a/sys/alpha/alpha/sgmap.c
+++ b/sys/alpha/alpha/sgmap.c
@@ -36,7 +36,6 @@
 #include <machine/sgmap.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_map.h>
 
 MALLOC_DEFINE(M_SGMAP, "sgmap", "Scatter Gather mapping");
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index cbd42bc..19d5339 100644
--- a/sys/alpha/alpha/trap.c
+++ b/sys/alpha/alpha/trap.c
@@ -47,7 +47,6 @@
 #include <sys/pioctl.h>
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c
index a77458c..e9ed2c7 100644
--- a/sys/alpha/alpha/vm_machdep.c
+++ b/sys/alpha/alpha/vm_machdep.c
@@ -85,7 +85,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
diff --git a/sys/alpha/include/prom.h b/sys/alpha/include/prom.h
index d3bee60..63763e4 100644
--- a/sys/alpha/include/prom.h
+++ b/sys/alpha/include/prom.h
@@ -25,6 +25,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $FreeBSD$
  */
 
 #ifndef	ASSEMBLER
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index d282439..4d0def0 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -47,7 +47,6 @@
 #include <sys/malloc.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_extern.h>
 #include <sys/exec.h>
diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index 2f8a239..8b4ae9d 100644
--- a/sys/alpha/pci/apecs.c
+++ b/sys/alpha/pci/apecs.c
@@ -77,7 +77,6 @@
 #include <machine/sgmap.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 
 #define KV(pa)			ALPHA_PHYS_TO_K0SEG(pa)
diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c
index 4251e06..f89de15 100644
--- a/sys/alpha/pci/cia.c
+++ b/sys/alpha/pci/cia.c
@@ -114,7 +114,6 @@
 #include <machine/sgmap.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 
 #define KV(pa)			ALPHA_PHYS_TO_K0SEG(pa)
diff --git a/sys/alpha/pci/lca.c b/sys/alpha/pci/lca.c
index a510004..5951332 100644
--- a/sys/alpha/pci/lca.c
+++ b/sys/alpha/pci/lca.c
@@ -46,7 +46,6 @@
 #include <machine/sgmap.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 
 #define KV(pa)			ALPHA_PHYS_TO_K0SEG(pa)
diff --git a/sys/alpha/pci/tsunami.c b/sys/alpha/pci/tsunami.c
index 5468a62..32fbdcb 100644
--- a/sys/alpha/pci/tsunami.c
+++ b/sys/alpha/pci/tsunami.c
@@ -51,7 +51,6 @@
 #include <machine/sgmap.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 
 #define KV(pa)			ALPHA_PHYS_TO_K0SEG(pa)