diff options
| author | phk <phk@FreeBSD.org> | 1999-10-29 18:09:36 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-10-29 18:09:36 +0000 |
| commit | 8e3c3eafedf7a33a4058652691ad300f004263e7 (patch) | |
| tree | 54ae4dddde04dac71ef8349b9ecc3e6ad3401152 /sys | |
| parent | 2997de7f2f8690623c3c48e8e176212a5a554fb9 (diff) | |
| download | FreeBSD-src-8e3c3eafedf7a33a4058652691ad300f004263e7.zip FreeBSD-src-8e3c3eafedf7a33a4058652691ad300f004263e7.tar.gz | |
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.
Diffstat (limited to 'sys')
110 files changed, 50 insertions, 290 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) diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c index c16333c..0868b7c 100644 --- a/sys/amd64/amd64/busdma_machdep.c +++ b/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> diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 11f1880..5aa445a 100644 --- a/sys/amd64/amd64/machdep.c +++ b/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> diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index f8be5bb..70dac4e 100644 --- a/sys/amd64/amd64/mem.c +++ b/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> diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index ac9cd3c..bb690d3 100644 --- a/sys/amd64/amd64/pmap.c +++ b/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> diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 5e3ed49..4d48110 100644 --- a/sys/amd64/amd64/trap.c +++ b/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> diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 252f3a6..2b5fb7b 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/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> diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index e916728..5c420ba 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/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> diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index ff5ba44..36f1165 100644 --- a/sys/compat/linux/linux_misc.c +++ b/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> diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c index 707e7e4..7dc0d63 100644 --- a/sys/compat/svr4/imgact_svr4.c +++ b/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> diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index a24759e..2b39d6b 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/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) diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c index 6ba85c0..186a3cc 100644 --- a/sys/ddb/db_watch.c +++ b/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> diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 25a997e..62bd58f 100644 --- a/sys/dev/ata/ata-disk.c +++ b/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> diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c index 0e51db4..dab0ca1 100644 --- a/sys/dev/vn/vn.c +++ b/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> diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c index a77647e..db0023c 100644 --- a/sys/fs/ntfs/ntfs_vfsops.c +++ b/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> diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c index 578f8bf..9d3f6e5 100644 --- a/sys/fs/ntfs/ntfs_vnops.c +++ b/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> diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c index e74e463..1187ae3 100644 --- a/sys/fs/nwfs/nwfs_io.c +++ b/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> diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c index bd4ca7a..223143e 100644 --- a/sys/fs/nwfs/nwfs_node.c +++ b/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> diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c index 83d73ab..1caa630 100644 --- a/sys/fs/procfs/procfs_map.c +++ b/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> diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index 35ee564..43652f1 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/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> diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index 152c9c0..887b010 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/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> diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 0be000d..0e74f39 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/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> diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c index c16333c..0868b7c 100644 --- a/sys/i386/i386/busdma_machdep.c +++ b/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> diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 11f1880..5aa445a 100644 --- a/sys/i386/i386/machdep.c +++ b/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> diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index f8be5bb..70dac4e 100644 --- a/sys/i386/i386/mem.c +++ b/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> diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index ac9cd3c..bb690d3 100644 --- a/sys/i386/i386/pmap.c +++ b/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> diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 5e3ed49..4d48110 100644 --- a/sys/i386/i386/trap.c +++ b/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> diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c index ad1bbfc..93dc697 100644 --- a/sys/i386/i386/vm86.c +++ b/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> diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 252f3a6..2b5fb7b 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/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> diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c index 5c0b316..a827dee 100644 --- a/sys/i386/ibcs2/imgact_coff.c +++ b/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> diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index 1e90fcb..f0d364a 100644 --- a/sys/i386/isa/wd.c +++ b/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> diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index 6a766ba..c560d74 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/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> diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c index ff5ba44..36f1165 100644 --- a/sys/i386/linux/linux_misc.c +++ b/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> diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index d282439..4d0def0 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/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> diff --git a/sys/i386/svr4/svr4_machdep.c b/sys/i386/svr4/svr4_machdep.c index dc8e681..f580ebf 100644 --- a/sys/i386/svr4/svr4_machdep.c +++ b/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> 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> diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c index ea63d3a..6026792 100644 --- a/sys/miscfs/devfs/devfs_vnops.c +++ b/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> diff --git a/sys/miscfs/procfs/procfs_map.c b/sys/miscfs/procfs/procfs_map.c index 83d73ab..1caa630 100644 --- a/sys/miscfs/procfs/procfs_map.c +++ b/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> diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c index 35ee564..43652f1 100644 --- a/sys/miscfs/procfs/procfs_mem.c +++ b/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> diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index 152c9c0..887b010 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/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> diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c index 0be000d..0e74f39 100644 --- a/sys/miscfs/union/union_vnops.c +++ b/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> diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 9aa6af5..63cc67e 100644 --- a/sys/nfs/nfs_bio.c +++ b/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> diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index 9aa6af5..63cc67e 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/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> diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c index a77647e..db0023c 100644 --- a/sys/ntfs/ntfs_vfsops.c +++ b/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> diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c index 578f8bf..9d3f6e5 100644 --- a/sys/ntfs/ntfs_vnops.c +++ b/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> diff --git a/sys/nwfs/nwfs_io.c b/sys/nwfs/nwfs_io.c index e74e463..1187ae3 100644 --- a/sys/nwfs/nwfs_io.c +++ b/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> diff --git a/sys/nwfs/nwfs_node.c b/sys/nwfs/nwfs_node.c index bd4ca7a..223143e 100644 --- a/sys/nwfs/nwfs_node.c +++ b/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> diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 560f8a3..95025ea 100644 --- a/sys/pc98/i386/machdep.c +++ b/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> diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 560f8a3..95025ea 100644 --- a/sys/pc98/pc98/machdep.c +++ b/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> diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 8357cc7..6d26b0e 100644 --- a/sys/pc98/pc98/wd.c +++ b/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> diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c index a77458c..e9ed2c7 100644 --- a/sys/powerpc/aim/vm_machdep.c +++ b/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> diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c index a77458c..e9ed2c7 100644 --- a/sys/powerpc/powerpc/vm_machdep.c +++ b/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> diff --git a/sys/svr4/imgact_svr4.c b/sys/svr4/imgact_svr4.c index 707e7e4..7dc0d63 100644 --- a/sys/svr4/imgact_svr4.c +++ b/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> diff --git a/sys/svr4/svr4_misc.c b/sys/svr4/svr4_misc.c index a24759e..2b39d6b 100644 --- a/sys/svr4/svr4_misc.c +++ b/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) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 16c4914..e5897dc 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/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"); diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 59b8dcd..25bea1f 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/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> diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c index 91115f4..f587c1e 100644 --- a/sys/vm/default_pager.c +++ b/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> diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index d08c14b..f7b1a87 100644 --- a/sys/vm/device_pager.c +++ b/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> diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 54505fa..4807ddf 100644 --- a/sys/vm/swap_pager.c +++ b/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> diff --git a/sys/vm/vm.h b/sys/vm/vm.h index 1fd2745..6d66211 100644 --- a/sys/vm/vm.h +++ b/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; diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 091389b..ca1ee1c 100644 --- a/sys/vm/vm_fault.c +++ b/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> diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 1d7157c..5fe78fd 100644 --- a/sys/vm/vm_glue.c +++ b/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> diff --git a/sys/vm/vm_inherit.h b/sys/vm/vm_inherit.h deleted file mode 100644 index 8d7b7f6..0000000 --- a/sys/vm/vm_inherit.h +++ /dev/null @@ -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_ */ diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index f7f1df8..6357e45 100644 --- a/sys/vm/vm_init.c +++ b/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> diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 895c5ae..9b8584c 100644 --- a/sys/vm/vm_kern.c +++ b/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> diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index e1a23b3..75dcadf 100644 --- a/sys/vm/vm_map.c +++ b/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> diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index 6c69562..737714f 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -42,7 +42,6 @@ #include <sys/vmmeter.h> #include <vm/vm.h> -#include <vm/vm_prot.h> #include <vm/vm_page.h> #include <vm/vm_extern.h> #include <vm/vm_param.h> diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 0151508..ce349acb 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -63,8 +63,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> diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 999d9be..1df9faf 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -78,7 +78,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> -#include <vm/vm_prot.h> #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/vm_object.h> diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 533ba37..99a8fef 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -77,7 +77,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> diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index d24e51c..fd5f956 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -86,7 +86,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> -#include <vm/vm_prot.h> #include <sys/lock.h> #include <vm/vm_object.h> #include <vm/vm_page.h> diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index a9e1c7e..1bef6df 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -80,7 +80,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> -#include <vm/vm_prot.h> #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pager.h> diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h deleted file mode 100644 index 68e552e..0000000 --- a/sys/vm/vm_prot.h +++ /dev/null @@ -1,97 +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_prot.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 protection definitions. - */ - -#ifndef _VM_PROT_ -#define _VM_PROT_ - -/* - * Protection values, defined as bits within the vm_prot_t type - */ - -#define VM_PROT_NONE ((vm_prot_t) 0x00) - -#define VM_PROT_READ ((vm_prot_t) 0x01) /* read permission */ -#define VM_PROT_WRITE ((vm_prot_t) 0x02) /* write permission */ -#define VM_PROT_EXECUTE ((vm_prot_t) 0x04) /* execute permission */ -#define VM_PROT_OVERRIDE_WRITE ((vm_prot_t) 0x08) /* write, overriding permission for COW */ - -/* - * The default protection for newly-created virtual memory - */ - -#define VM_PROT_DEFAULT (VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE) - -/* - * The maximum privileges possible, for parameter checking. - */ - -#define VM_PROT_ALL (VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE) - -#endif /* _VM_PROT_ */ diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c index f81101b..7c5c924 100644 --- a/sys/vm/vm_unix.c +++ b/sys/vm/vm_unix.c @@ -55,7 +55,6 @@ #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/swap_pager.h> -#include <vm/vm_prot.h> #ifndef _SYS_SYSPROTO_H_ struct obreak_args { diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c index dab39a7..e111b83 100644 --- a/sys/vm/vm_zone.c +++ b/sys/vm/vm_zone.c @@ -24,7 +24,6 @@ #include <vm/vm.h> #include <vm/vm_object.h> -#include <vm/vm_prot.h> #include <vm/vm_page.h> #include <vm/vm_map.h> #include <vm/vm_kern.h> diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index cc7cd4b..1ccc692 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -61,7 +61,6 @@ #include <sys/conf.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> |
