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.

19 files changed, 0 insertions, 20 deletions

diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 53de00e..eea280d 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -47,7 +47,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index dc55fa9..8d706c5 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -59,7 +59,6 @@
 #include <sys/lock.h>
 #include <vm/vm_map.h>
 #include <vm/vm_object.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_extern.h>
 
 #include <machine/elf.h>
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index f3c2e60..a3a6a68 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -36,7 +36,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 21875b8..fb21b4b 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -66,7 +66,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 6bb57e0..35aa228 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -51,7 +51,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_page.h>
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index d3bbcb1..2fd11ab 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -52,7 +52,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 2b32e3d..c0f7f64 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -49,7 +49,6 @@
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 9556209..8c12566 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -39,7 +39,6 @@
 
 #include <vm/vm.h>
 #ifdef SPARSE_MAPPING
-#include <vm/vm_prot.h>
 #endif
 #include <vm/vm_param.h>
 #include <sys/lock.h>
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 9556209..8c12566 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -39,7 +39,6 @@
 
 #include <vm/vm.h>
 #ifdef SPARSE_MAPPING
-#include <vm/vm_prot.h>
 #endif
 #include <vm/vm_param.h>
 #include <sys/lock.h>
diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index 080bec7..5455a7b 100644
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -72,7 +72,6 @@
 #include <sys/blist.h>
 #include <sys/malloc.h>
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 5e3ed49..4d48110 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -65,7 +65,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index ee883ed..de73bf9 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -66,7 +66,6 @@
 #include <sys/uio.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_param.h>
 #include <sys/lock.h>
 #include <vm/vm_object.h>
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 6280666..75b72fb 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -40,7 +40,6 @@
 
 #include <machine/reg.h>
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 533502c..6fcfdf2 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -47,14 +47,12 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_object.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
-#include <vm/vm_inherit.h>
 
 #ifndef _SYS_SYSPROTO_H_
 struct shmat_args;
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index baa6c5c..ade2c4d 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -62,7 +62,6 @@
 #include <sys/ktrace.h>
 #endif
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index c44ae8a..8c927fe 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -39,7 +39,6 @@
 #include <sys/lock.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_page.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index d8c77db..7a8ce7c 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -48,7 +48,6 @@
 #include <sys/mount.h>
 #include <sys/resourcevar.h>
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <sys/sysctl.h>
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 62851f9..0ee9daa 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -64,7 +64,6 @@
 #include <machine/limits.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 62851f9..0ee9daa 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -64,7 +64,6 @@
 #include <machine/limits.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>