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.

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>

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>

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>

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>
 

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>

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>

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

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>

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");

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>

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>

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

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>

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)

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)

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)

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)

sys/amd64/amd64/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>

sys/amd64/amd64/machdep.c

@@ -87,7 +87,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_object.h>

sys/amd64/amd64/mem.c

@@ -64,7 +64,6 @@
 #include <i386/isa/intr_machdep.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 

sys/amd64/amd64/pmap.c

@@ -82,7 +82,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>

sys/amd64/amd64/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>

sys/amd64/amd64/vm_machdep.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/vm_kern.h>
 #include <vm/vm_page.h>

sys/cam/scsi/scsi_da.c

@@ -44,7 +44,6 @@
 #include <machine/md_var.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/pmap.h>
 
 #include <cam/cam.h>

sys/compat/linux/linux_misc.c

@@ -52,7 +52,6 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 

sys/compat/svr4/imgact_svr4.c

@@ -49,7 +49,6 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_extern.h>
 
 #include <svr4/svr4.h>

sys/compat/svr4/svr4_misc.c

@@ -84,7 +84,6 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_map.h>
-#include <vm/vm_prot.h>
 
 #if defined(NetBSD)
 # if defined(UVM)

sys/ddb/db_watch.c

@@ -38,7 +38,6 @@
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
-#include <vm/vm_prot.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_watch.h>

sys/dev/ata/ata-disk.c

@@ -41,7 +41,6 @@
 #include <sys/disk.h>
 #include <sys/devicestat.h>
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/pmap.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>

sys/dev/vn/vn.c

@@ -79,7 +79,6 @@
 #include <sys/vnioctl.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>

sys/fs/ntfs/ntfs_vfsops.c

@@ -43,7 +43,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>

sys/fs/ntfs/ntfs_vnops.c

@@ -55,7 +55,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>

sys/fs/nwfs/nwfs_io.c

@@ -46,7 +46,6 @@
 #include <sys/sysctl.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>

sys/fs/nwfs/nwfs_node.c

@@ -42,7 +42,6 @@
 #include <sys/sysctl.h>
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <sys/queue.h>

sys/fs/procfs/procfs_map.c

@@ -46,7 +46,6 @@
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>

sys/fs/procfs/procfs_mem.c

@@ -52,7 +52,6 @@
 #include <miscfs/procfs/procfs.h>
 #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>

sys/fs/specfs/spec_vnops.c

@@ -50,7 +50,6 @@
 #include <sys/tty.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>

sys/fs/unionfs/union_vnops.c

@@ -56,7 +56,6 @@
 #include <vm/vm.h>
 #include <vm/vnode_pager.h>
 
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>

sys/i386/i386/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>

sys/i386/i386/machdep.c

@@ -87,7 +87,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_object.h>

sys/i386/i386/mem.c

@@ -64,7 +64,6 @@
 #include <i386/isa/intr_machdep.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 

sys/i386/i386/pmap.c

@@ -82,7 +82,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>

sys/i386/i386/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>

sys/i386/i386/vm86.c

@@ -33,7 +33,6 @@
 #include <sys/malloc.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>

sys/i386/i386/vm_machdep.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/vm_kern.h>
 #include <vm/vm_page.h>

sys/i386/ibcs2/imgact_coff.c

@@ -41,7 +41,6 @@
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>

sys/i386/isa/wd.c

@@ -87,7 +87,6 @@
 #include <i386/isa/wdreg.h>
 #include <sys/syslog.h>
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/pmap.h>
 
 #include <i386/isa/atapi.h>

sys/i386/linux/imgact_linux.c

@@ -48,7 +48,6 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_extern.h>
 
 #include <i386/linux/linux.h>

sys/i386/linux/linux_misc.c

@@ -52,7 +52,6 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 

sys/i386/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>

sys/i386/svr4/svr4_machdep.c

@@ -40,7 +40,6 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_extern.h>
 #include <sys/user.h>
 #include <sys/filedesc.h>

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>

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>

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>

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>

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>

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>

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>
 

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>

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>

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>

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>

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>

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>

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;

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>

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>

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>

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>

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>

sys/miscfs/devfs/devfs_vnops.c

@@ -45,7 +45,6 @@
 #include <sys/vmmeter.h>                                                        
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>

sys/miscfs/procfs/procfs_map.c

@@ -46,7 +46,6 @@
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>

sys/miscfs/procfs/procfs_mem.c

@@ -52,7 +52,6 @@
 #include <miscfs/procfs/procfs.h>
 #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>

sys/miscfs/specfs/spec_vnops.c

@@ -50,7 +50,6 @@
 #include <sys/tty.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>

sys/miscfs/union/union_vnops.c

@@ -56,7 +56,6 @@
 #include <vm/vm.h>
 #include <vm/vnode_pager.h>
 
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>

sys/nfs/nfs_bio.c

@@ -50,7 +50,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>

sys/nfsclient/nfs_bio.c

@@ -50,7 +50,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>

sys/ntfs/ntfs_vfsops.c

@@ -43,7 +43,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>

sys/ntfs/ntfs_vnops.c

@@ -55,7 +55,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>

sys/nwfs/nwfs_io.c

@@ -46,7 +46,6 @@
 #include <sys/sysctl.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>

sys/nwfs/nwfs_node.c

@@ -42,7 +42,6 @@
 #include <sys/sysctl.h>
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <sys/queue.h>

sys/pc98/i386/machdep.c

@@ -87,7 +87,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_object.h>

sys/pc98/pc98/machdep.c

@@ -87,7 +87,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_object.h>

sys/pc98/pc98/wd.c

@@ -93,7 +93,6 @@
 #include <i386/isa/wdreg.h>
 #include <sys/syslog.h>
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/pmap.h>
 
 #include <i386/isa/atapi.h>

sys/powerpc/aim/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>

sys/powerpc/powerpc/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>

sys/svr4/imgact_svr4.c

@@ -49,7 +49,6 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_extern.h>
 
 #include <svr4/svr4.h>

sys/svr4/svr4_misc.c

@@ -84,7 +84,6 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_map.h>
-#include <vm/vm_prot.h>
 
 #if defined(NetBSD)
 # if defined(UVM)

sys/ufs/ffs/ffs_vfsops.c

@@ -58,7 +58,6 @@
 #include <ufs/ffs/ffs_extern.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 
 static MALLOC_DEFINE(M_FFSNODE, "FFS node", "FFS vnode private part");

sys/ufs/ffs/ffs_vnops.c

@@ -49,7 +49,6 @@
 #include <machine/limits.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>

sys/vm/default_pager.c

@@ -45,7 +45,6 @@
 #include <sys/vmmeter.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>

sys/vm/device_pager.c

@@ -46,7 +46,6 @@
 #include <sys/malloc.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>

sys/vm/swap_pager.c

@@ -88,7 +88,6 @@
 
 #include "opt_swap.h"
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>

sys/vm/vm.h

@@ -31,15 +31,58 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm.h	8.2 (Berkeley) 12/13/93
+ *	@(#)vm_prot.h	8.1 (Berkeley) 6/11/93
+ *	@(#)vm_inherit.h	8.1 (Berkeley) 6/11/93
+ *
+ * Copyright (c) 1987, 1990 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Authors: Avadis Tevanian, Jr., Michael Wayne Young
+ *
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ *
  * $FreeBSD$
  */
 
 #ifndef VM_H
 #define VM_H
 
-typedef char vm_inherit_t;	/* XXX: inheritance codes */
+typedef char vm_inherit_t;	/* inheritance codes */
+
+#define	VM_INHERIT_SHARE	((vm_inherit_t) 0)
+#define	VM_INHERIT_COPY		((vm_inherit_t) 1)
+#define	VM_INHERIT_NONE		((vm_inherit_t) 2)
+#define	VM_INHERIT_DEFAULT	VM_INHERIT_COPY
+
 typedef u_char vm_prot_t;	/* protection codes */
 
+#define	VM_PROT_NONE		((vm_prot_t) 0x00)
+#define	VM_PROT_READ		((vm_prot_t) 0x01)
+#define	VM_PROT_WRITE		((vm_prot_t) 0x02)
+#define	VM_PROT_EXECUTE		((vm_prot_t) 0x04)
+#define	VM_PROT_OVERRIDE_WRITE	((vm_prot_t) 0x08)	/* copy-on-write */
+
+#define	VM_PROT_ALL		(VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)
+#define	VM_PROT_DEFAULT		VM_PROT_ALL
+
 union vm_map_object;
 typedef union vm_map_object vm_map_object_t;
 

sys/vm/vm_fault.c

@@ -82,7 +82,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>

sys/vm/vm_glue.c

@@ -81,7 +81,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>

sys/vm/vm_inherit.h

@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)vm_inherit.h	8.1 (Berkeley) 6/11/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD$
- */
-
-/*
- *	Virtual memory map inheritance definitions.
- */
-
-#ifndef	_VM_INHERIT_
-#define	_VM_INHERIT_
-
-/*
- *	Enumeration of valid values for vm_inherit_t.
- */
-
-#define	VM_INHERIT_SHARE	((vm_inherit_t) 0)	/* share with child */
-#define	VM_INHERIT_COPY		((vm_inherit_t) 1)	/* copy into child */
-#define VM_INHERIT_NONE		((vm_inherit_t) 2)	/* absent from child */
-
-#define VM_INHERIT_DEFAULT	VM_INHERIT_COPY
-
-#endif				/* _VM_INHERIT_ */

sys/vm/vm_init.c

@@ -73,7 +73,6 @@
 #include <sys/systm.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>

sys/vm/vm_kern.c

@@ -75,7 +75,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>

sys/vm/vm_map.c

@@ -79,8 +79,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_prot.h>
-#include <vm/vm_inherit.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>