From 923502ff91327138aa9ef1d59ea7044d2936e0ef Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Fri, 29 Oct 1999 18:09:36 +0000 Subject: [PATCH] useracc() the prequel: Merge the contents (less some trivial bordering the silly comments) of and into . 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 | 1 - sys/alpha/alpha/fp_emulate.c | 1 - sys/alpha/alpha/machdep.c | 1 - sys/alpha/alpha/mem.c | 1 - sys/alpha/alpha/pmap.c | 1 - sys/alpha/alpha/prom.c | 3 +- sys/alpha/alpha/prom_disp.s | 2 + sys/alpha/alpha/promcons.c | 1 - sys/alpha/alpha/sgmap.c | 1 - sys/alpha/alpha/trap.c | 1 - sys/alpha/alpha/vm_machdep.c | 1 - sys/alpha/include/prom.h | 2 + sys/alpha/linux/linux_sysvec.c | 1 - sys/alpha/pci/apecs.c | 1 - sys/alpha/pci/cia.c | 1 - sys/alpha/pci/lca.c | 1 - sys/alpha/pci/tsunami.c | 1 - sys/amd64/amd64/busdma_machdep.c | 1 - sys/amd64/amd64/machdep.c | 1 - sys/amd64/amd64/mem.c | 1 - sys/amd64/amd64/pmap.c | 1 - sys/amd64/amd64/trap.c | 1 - sys/amd64/amd64/vm_machdep.c | 1 - sys/cam/scsi/scsi_da.c | 1 - sys/compat/linux/linux_misc.c | 1 - sys/compat/svr4/imgact_svr4.c | 1 - sys/compat/svr4/svr4_misc.c | 1 - sys/ddb/db_watch.c | 1 - sys/dev/ata/ata-disk.c | 1 - sys/dev/vn/vn.c | 1 - sys/fs/ntfs/ntfs_vfsops.c | 1 - sys/fs/ntfs/ntfs_vnops.c | 1 - sys/fs/nwfs/nwfs_io.c | 1 - sys/fs/nwfs/nwfs_node.c | 1 - sys/fs/procfs/procfs_map.c | 1 - sys/fs/procfs/procfs_mem.c | 1 - sys/fs/specfs/spec_vnops.c | 1 - sys/fs/unionfs/union_vnops.c | 1 - sys/i386/i386/busdma_machdep.c | 1 - sys/i386/i386/machdep.c | 1 - sys/i386/i386/mem.c | 1 - sys/i386/i386/pmap.c | 1 - sys/i386/i386/trap.c | 1 - sys/i386/i386/vm86.c | 1 - sys/i386/i386/vm_machdep.c | 1 - sys/i386/ibcs2/imgact_coff.c | 1 - sys/i386/isa/wd.c | 1 - sys/i386/linux/imgact_linux.c | 1 - sys/i386/linux/linux_misc.c | 1 - sys/i386/linux/linux_sysvec.c | 1 - sys/i386/svr4/svr4_machdep.c | 1 - sys/kern/imgact_aout.c | 1 - sys/kern/imgact_elf.c | 1 - sys/kern/imgact_gzip.c | 1 - sys/kern/init_main.c | 1 - sys/kern/kern_exec.c | 1 - sys/kern/kern_resource.c | 1 - sys/kern/kern_subr.c | 1 - sys/kern/link_elf.c | 1 - sys/kern/link_elf_obj.c | 1 - sys/kern/subr_blist.c | 1 - sys/kern/subr_trap.c | 1 - sys/kern/sys_pipe.c | 1 - sys/kern/sys_process.c | 1 - sys/kern/sysv_shm.c | 2 - sys/kern/uipc_syscalls.c | 1 - sys/kern/vfs_bio.c | 1 - sys/kern/vfs_cluster.c | 1 - sys/kern/vfs_export.c | 1 - sys/kern/vfs_subr.c | 1 - sys/miscfs/devfs/devfs_vnops.c | 1 - sys/miscfs/procfs/procfs_map.c | 1 - sys/miscfs/procfs/procfs_mem.c | 1 - sys/miscfs/specfs/spec_vnops.c | 1 - sys/miscfs/union/union_vnops.c | 1 - sys/nfs/nfs_bio.c | 1 - sys/nfsclient/nfs_bio.c | 1 - sys/ntfs/ntfs_vfsops.c | 1 - sys/ntfs/ntfs_vnops.c | 1 - sys/nwfs/nwfs_io.c | 1 - sys/nwfs/nwfs_node.c | 1 - sys/pc98/i386/machdep.c | 1 - sys/pc98/pc98/machdep.c | 1 - sys/pc98/pc98/wd.c | 1 - sys/powerpc/aim/vm_machdep.c | 1 - sys/powerpc/powerpc/vm_machdep.c | 1 - sys/svr4/imgact_svr4.c | 1 - sys/svr4/svr4_misc.c | 1 - sys/ufs/ffs/ffs_vfsops.c | 1 - sys/ufs/ffs/ffs_vnops.c | 1 - sys/vm/default_pager.c | 1 - sys/vm/device_pager.c | 1 - sys/vm/swap_pager.c | 1 - sys/vm/vm.h | 45 ++++++++++++++- sys/vm/vm_fault.c | 1 - sys/vm/vm_glue.c | 1 - sys/vm/vm_inherit.h | 84 --------------------------- sys/vm/vm_init.c | 1 - sys/vm/vm_kern.c | 1 - sys/vm/vm_map.c | 2 - sys/vm/vm_meter.c | 1 - sys/vm/vm_mmap.c | 2 - sys/vm/vm_object.c | 1 - sys/vm/vm_page.c | 1 - sys/vm/vm_pageout.c | 1 - sys/vm/vm_pager.c | 1 - sys/vm/vm_prot.h | 97 -------------------------------- sys/vm/vm_unix.c | 1 - sys/vm/vm_zone.c | 1 - sys/vm/vnode_pager.c | 1 - usr.bin/gcore/elfcore.c | 1 - 111 files changed, 50 insertions(+), 291 deletions(-) delete mode 100644 sys/vm/vm_inherit.h delete mode 100644 sys/vm/vm_prot.h diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c index cfc81155021..d01433ba01a 100644 --- a/sys/alpha/alpha/busdma_machdep.c +++ b/sys/alpha/alpha/busdma_machdep.c @@ -31,7 +31,6 @@ #include #include -#include #include #include diff --git a/sys/alpha/alpha/fp_emulate.c b/sys/alpha/alpha/fp_emulate.c index ad07a8ea597..3b8d6dc1f65 100644 --- a/sys/alpha/alpha/fp_emulate.c +++ b/sys/alpha/alpha/fp_emulate.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index 1d6f2ae81d6..27c6cf3eca3 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -115,7 +115,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c index 35a277343c0..ce09425b4a7 100644 --- a/sys/alpha/alpha/mem.c +++ b/sys/alpha/alpha/mem.c @@ -64,7 +64,6 @@ #endif #include -#include #include #include diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c index 411b4a4ee19..5fca8b3f0db 100644 --- a/sys/alpha/alpha/pmap.c +++ b/sys/alpha/alpha/pmap.c @@ -159,7 +159,6 @@ #include #include -#include #include #include #include diff --git a/sys/alpha/alpha/prom.c b/sys/alpha/alpha/prom.c index ddb467917bf..e677e7db1f9 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 #include #include -#include #include #include #include diff --git a/sys/alpha/alpha/prom_disp.s b/sys/alpha/alpha/prom_disp.s index 23bdbef9315..0c548b4f49d 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 8b4d3b1c59f..649df02f7e7 100644 --- a/sys/alpha/alpha/promcons.c +++ b/sys/alpha/alpha/promcons.c @@ -40,7 +40,6 @@ #include #include -#include #include #include #include diff --git a/sys/alpha/alpha/sgmap.c b/sys/alpha/alpha/sgmap.c index 94517e79936..cd20a4ab37f 100644 --- a/sys/alpha/alpha/sgmap.c +++ b/sys/alpha/alpha/sgmap.c @@ -36,7 +36,6 @@ #include #include #include -#include #include MALLOC_DEFINE(M_SGMAP, "sgmap", "Scatter Gather mapping"); diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c index cbd42bc57b1..19d53399608 100644 --- a/sys/alpha/alpha/trap.c +++ b/sys/alpha/alpha/trap.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c index a77458c46c2..e9ed2c75ee3 100644 --- a/sys/alpha/alpha/vm_machdep.c +++ b/sys/alpha/alpha/vm_machdep.c @@ -85,7 +85,6 @@ #include #include -#include #include #include #include diff --git a/sys/alpha/include/prom.h b/sys/alpha/include/prom.h index d3bee60c448..63763e40471 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 d282439af57..4d0def06ea2 100644 --- a/sys/alpha/linux/linux_sysvec.c +++ b/sys/alpha/linux/linux_sysvec.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c index 2f8a2399714..8b4ae9dd189 100644 --- a/sys/alpha/pci/apecs.c +++ b/sys/alpha/pci/apecs.c @@ -77,7 +77,6 @@ #include #include -#include #include #define KV(pa) ALPHA_PHYS_TO_K0SEG(pa) diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c index 4251e06be6f..f89de155719 100644 --- a/sys/alpha/pci/cia.c +++ b/sys/alpha/pci/cia.c @@ -114,7 +114,6 @@ #include #include -#include #include #define KV(pa) ALPHA_PHYS_TO_K0SEG(pa) diff --git a/sys/alpha/pci/lca.c b/sys/alpha/pci/lca.c index a510004ada9..59513327e8a 100644 --- a/sys/alpha/pci/lca.c +++ b/sys/alpha/pci/lca.c @@ -46,7 +46,6 @@ #include #include -#include #include #define KV(pa) ALPHA_PHYS_TO_K0SEG(pa) diff --git a/sys/alpha/pci/tsunami.c b/sys/alpha/pci/tsunami.c index 5468a62ca0d..32fbdcb375a 100644 --- a/sys/alpha/pci/tsunami.c +++ b/sys/alpha/pci/tsunami.c @@ -51,7 +51,6 @@ #include #include -#include #include #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 c16333ced11..0868b7c196d 100644 --- a/sys/amd64/amd64/busdma_machdep.c +++ b/sys/amd64/amd64/busdma_machdep.c @@ -31,7 +31,6 @@ #include #include -#include #include #include diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 11f1880fec8..5aa445a5290 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -87,7 +87,6 @@ #include #include -#include #include #include #include diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index f8be5bbdbb8..70dac4e953b 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -64,7 +64,6 @@ #include #include -#include #include #include diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index ac9cd3c19a8..bb690d30205 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -82,7 +82,6 @@ #include #include -#include #include #include #include diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 5e3ed49ee48..4d48110e2c9 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -65,7 +65,6 @@ #include #include -#include #include #include #include diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 252f3a613f3..2b5fb7b015b 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -66,7 +66,6 @@ #include #include -#include #include #include #include diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index e916728ef67..5c420bafc26 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -44,7 +44,6 @@ #include #include -#include #include #include diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index ff5ba447c6c..36f1165ca2e 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -52,7 +52,6 @@ #include #include #include -#include #include #include diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c index 707e7e4d3ac..7dc0d635c4d 100644 --- a/sys/compat/svr4/imgact_svr4.c +++ b/sys/compat/svr4/imgact_svr4.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index a24759e64e5..2b39d6b4f55 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -84,7 +84,6 @@ #include #include #include -#include #if defined(NetBSD) # if defined(UVM) diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c index 6ba85c03995..186a3cccf42 100644 --- a/sys/ddb/db_watch.c +++ b/sys/ddb/db_watch.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 25a997ef526..62bd58f0a3a 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c index 0e51db42610..dab0ca16c34 100644 --- a/sys/dev/vn/vn.c +++ b/sys/dev/vn/vn.c @@ -79,7 +79,6 @@ #include #include -#include #include #include #include diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c index a77647e330f..db0023cc1bd 100644 --- a/sys/fs/ntfs/ntfs_vfsops.c +++ b/sys/fs/ntfs/ntfs_vfsops.c @@ -43,7 +43,6 @@ #include #include -#include #include #include #include diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c index 578f8bf62df..9d3f6e54eb9 100644 --- a/sys/fs/ntfs/ntfs_vnops.c +++ b/sys/fs/ntfs/ntfs_vnops.c @@ -55,7 +55,6 @@ #include #include -#include #include #include #include diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c index e74e463f121..1187ae3bb77 100644 --- a/sys/fs/nwfs/nwfs_io.c +++ b/sys/fs/nwfs/nwfs_io.c @@ -46,7 +46,6 @@ #include #include -#include #include #include #include diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c index bd4ca7a416c..223143ec84a 100644 --- a/sys/fs/nwfs/nwfs_node.c +++ b/sys/fs/nwfs/nwfs_node.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c index 83d73ab320d..1caa6305a73 100644 --- a/sys/fs/procfs/procfs_map.c +++ b/sys/fs/procfs/procfs_map.c @@ -46,7 +46,6 @@ #include #include -#include #include #include #include diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index 35ee564e074..43652f1293e 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/sys/fs/procfs/procfs_mem.c @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index 152c9c0bc64..887b010c4d4 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -50,7 +50,6 @@ #include #include -#include #include #include #include diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 0be000d95bc..0e74f394049 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -56,7 +56,6 @@ #include #include -#include #include #include #include diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c index c16333ced11..0868b7c196d 100644 --- a/sys/i386/i386/busdma_machdep.c +++ b/sys/i386/i386/busdma_machdep.c @@ -31,7 +31,6 @@ #include #include -#include #include #include diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 11f1880fec8..5aa445a5290 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -87,7 +87,6 @@ #include #include -#include #include #include #include diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index f8be5bbdbb8..70dac4e953b 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -64,7 +64,6 @@ #include #include -#include #include #include diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index ac9cd3c19a8..bb690d30205 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -82,7 +82,6 @@ #include #include -#include #include #include #include diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 5e3ed49ee48..4d48110e2c9 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -65,7 +65,6 @@ #include #include -#include #include #include #include diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c index ad1bbfceafa..93dc6973b08 100644 --- a/sys/i386/i386/vm86.c +++ b/sys/i386/i386/vm86.c @@ -33,7 +33,6 @@ #include #include -#include #include #include #include diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 252f3a613f3..2b5fb7b015b 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -66,7 +66,6 @@ #include #include -#include #include #include #include diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c index 5c0b316dacd..a827deede27 100644 --- a/sys/i386/ibcs2/imgact_coff.c +++ b/sys/i386/ibcs2/imgact_coff.c @@ -41,7 +41,6 @@ #include #include -#include #include #include #include diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index 1e90fcba698..f0d364a6522 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -87,7 +87,6 @@ #include #include #include -#include #include #include diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index 6a766ba5d9f..c560d74a170 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -48,7 +48,6 @@ #include #include #include -#include #include #include diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c index ff5ba447c6c..36f1165ca2e 100644 --- a/sys/i386/linux/linux_misc.c +++ b/sys/i386/linux/linux_misc.c @@ -52,7 +52,6 @@ #include #include #include -#include #include #include diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index d282439af57..4d0def06ea2 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/i386/svr4/svr4_machdep.c b/sys/i386/svr4/svr4_machdep.c index dc8e6812fef..f580ebf3869 100644 --- a/sys/i386/svr4/svr4_machdep.c +++ b/sys/i386/svr4/svr4_machdep.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index 53de00e7306..eea280d2926 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -47,7 +47,6 @@ #include #include -#include #include #include #include diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index dc55fa9b763..8d706c58727 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -59,7 +59,6 @@ #include #include #include -#include #include #include diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c index f3c2e6001df..a3a6a681779 100644 --- a/sys/kern/imgact_gzip.c +++ b/sys/kern/imgact_gzip.c @@ -36,7 +36,6 @@ #include #include -#include #include #include #include diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 21875b823d1..fb21b4ba75e 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -66,7 +66,6 @@ #include #include -#include #include #include #include diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 6bb57e09a17..35aa228da32 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -51,7 +51,6 @@ #include #include -#include #include #include #include diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index d3bbcb1b26e..2fd11abe0be 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -52,7 +52,6 @@ #include #include -#include #include #include #include diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 2b32e3d10c7..c0f7f6479e4 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -49,7 +49,6 @@ #include #include -#include #include #include diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 9556209663a..8c12566ac5e 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -39,7 +39,6 @@ #include #ifdef SPARSE_MAPPING -#include #endif #include #include diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 9556209663a..8c12566ac5e 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -39,7 +39,6 @@ #include #ifdef SPARSE_MAPPING -#include #endif #include #include diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c index 080bec79481..5455a7b95bd 100644 --- a/sys/kern/subr_blist.c +++ b/sys/kern/subr_blist.c @@ -72,7 +72,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 5e3ed49ee48..4d48110e2c9 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -65,7 +65,6 @@ #include #include -#include #include #include #include diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index ee883ed9984..de73bf9c601 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -66,7 +66,6 @@ #include #include -#include #include #include #include diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 6280666b814..75b72fb1d4e 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -40,7 +40,6 @@ #include #include -#include #include #include #include diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 533502cc5c0..6fcfdf23e28 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -47,14 +47,12 @@ #include #include -#include #include #include #include #include #include #include -#include #ifndef _SYS_SYSPROTO_H_ struct shmat_args; diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index baa6c5cfcbd..ade2c4df131 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -62,7 +62,6 @@ #include #endif #include -#include #include #include #include diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index c44ae8a6594..8c927fe6dc5 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index d8c77db6a29..7a8ce7c05df 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 62851f93682..0ee9daa38fe 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -64,7 +64,6 @@ #include #include -#include #include #include #include diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 62851f93682..0ee9daa38fe 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -64,7 +64,6 @@ #include #include -#include #include #include #include diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c index ea63d3a7e58..60267929c4d 100644 --- a/sys/miscfs/devfs/devfs_vnops.c +++ b/sys/miscfs/devfs/devfs_vnops.c @@ -45,7 +45,6 @@ #include #include -#include #include #include #include diff --git a/sys/miscfs/procfs/procfs_map.c b/sys/miscfs/procfs/procfs_map.c index 83d73ab320d..1caa6305a73 100644 --- a/sys/miscfs/procfs/procfs_map.c +++ b/sys/miscfs/procfs/procfs_map.c @@ -46,7 +46,6 @@ #include #include -#include #include #include #include diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c index 35ee564e074..43652f1293e 100644 --- a/sys/miscfs/procfs/procfs_mem.c +++ b/sys/miscfs/procfs/procfs_mem.c @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index 152c9c0bc64..887b010c4d4 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -50,7 +50,6 @@ #include #include -#include #include #include #include diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c index 0be000d95bc..0e74f394049 100644 --- a/sys/miscfs/union/union_vnops.c +++ b/sys/miscfs/union/union_vnops.c @@ -56,7 +56,6 @@ #include #include -#include #include #include #include diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 9aa6af50dbe..63cc67e7046 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -50,7 +50,6 @@ #include #include -#include #include #include #include diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index 9aa6af50dbe..63cc67e7046 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -50,7 +50,6 @@ #include #include -#include #include #include #include diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c index a77647e330f..db0023cc1bd 100644 --- a/sys/ntfs/ntfs_vfsops.c +++ b/sys/ntfs/ntfs_vfsops.c @@ -43,7 +43,6 @@ #include #include -#include #include #include #include diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c index 578f8bf62df..9d3f6e54eb9 100644 --- a/sys/ntfs/ntfs_vnops.c +++ b/sys/ntfs/ntfs_vnops.c @@ -55,7 +55,6 @@ #include #include -#include #include #include #include diff --git a/sys/nwfs/nwfs_io.c b/sys/nwfs/nwfs_io.c index e74e463f121..1187ae3bb77 100644 --- a/sys/nwfs/nwfs_io.c +++ b/sys/nwfs/nwfs_io.c @@ -46,7 +46,6 @@ #include #include -#include #include #include #include diff --git a/sys/nwfs/nwfs_node.c b/sys/nwfs/nwfs_node.c index bd4ca7a416c..223143ec84a 100644 --- a/sys/nwfs/nwfs_node.c +++ b/sys/nwfs/nwfs_node.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 560f8a34b77..95025ea1a52 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -87,7 +87,6 @@ #include #include -#include #include #include #include diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 560f8a34b77..95025ea1a52 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -87,7 +87,6 @@ #include #include -#include #include #include #include diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 8357cc74bd5..6d26b0eb73e 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -93,7 +93,6 @@ #include #include #include -#include #include #include diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c index a77458c46c2..e9ed2c75ee3 100644 --- a/sys/powerpc/aim/vm_machdep.c +++ b/sys/powerpc/aim/vm_machdep.c @@ -85,7 +85,6 @@ #include #include -#include #include #include #include diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c index a77458c46c2..e9ed2c75ee3 100644 --- a/sys/powerpc/powerpc/vm_machdep.c +++ b/sys/powerpc/powerpc/vm_machdep.c @@ -85,7 +85,6 @@ #include #include -#include #include #include #include diff --git a/sys/svr4/imgact_svr4.c b/sys/svr4/imgact_svr4.c index 707e7e4d3ac..7dc0d635c4d 100644 --- a/sys/svr4/imgact_svr4.c +++ b/sys/svr4/imgact_svr4.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include diff --git a/sys/svr4/svr4_misc.c b/sys/svr4/svr4_misc.c index a24759e64e5..2b39d6b4f55 100644 --- a/sys/svr4/svr4_misc.c +++ b/sys/svr4/svr4_misc.c @@ -84,7 +84,6 @@ #include #include #include -#include #if defined(NetBSD) # if defined(UVM) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 16c49140569..e5897dc7fb6 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -58,7 +58,6 @@ #include #include -#include #include 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 59b8dcdbdee..25bea1fa570 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -49,7 +49,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c index 91115f4115a..f587c1e56a7 100644 --- a/sys/vm/default_pager.c +++ b/sys/vm/default_pager.c @@ -45,7 +45,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index d08c14bc5d0..f7b1a87fdec 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -46,7 +46,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 54505fabea3..4807ddf7bd2 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -88,7 +88,6 @@ #include "opt_swap.h" #include -#include #include #include #include diff --git a/sys/vm/vm.h b/sys/vm/vm.h index 1fd27452dd0..6d6621134ae 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 091389b105b..ca1ee1c1f0c 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -82,7 +82,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 1d7157c7450..5fe78fd8d96 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -81,7 +81,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/vm_inherit.h b/sys/vm/vm_inherit.h deleted file mode 100644 index 8d7b7f6df50..00000000000 --- 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 f7f1df84a19..6357e454601 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -73,7 +73,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 895c5ae5e2e..9b8584cb3d9 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -75,7 +75,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index e1a23b36e84..75dcadfc987 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -79,8 +79,6 @@ #include #include -#include -#include #include #include #include diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index 6c695624bf5..737714fb269 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -42,7 +42,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 015150810a9..ce349acb2d4 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -63,8 +63,6 @@ #include #include -#include -#include #include #include #include diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 999d9bec782..1df9fafa2db 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -78,7 +78,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 533ba37fff6..99a8fefe250 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -77,7 +77,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index d24e51cec6f..fd5f956d4eb 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -86,7 +86,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index a9e1c7e9328..1bef6df45a6 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -80,7 +80,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h deleted file mode 100644 index 68e552e018a..00000000000 --- 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 f81101b2e78..7c5c924208f 100644 --- a/sys/vm/vm_unix.c +++ b/sys/vm/vm_unix.c @@ -55,7 +55,6 @@ #include #include #include -#include #ifndef _SYS_SYSPROTO_H_ struct obreak_args { diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c index dab39a7ede9..e111b835a93 100644 --- a/sys/vm/vm_zone.c +++ b/sys/vm/vm_zone.c @@ -24,7 +24,6 @@ #include #include -#include #include #include #include diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index cc7cd4bec79..1ccc6928284 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -61,7 +61,6 @@ #include #include -#include #include #include #include diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c index f66e584ac14..c05dad6c837 100644 --- a/usr.bin/gcore/elfcore.c +++ b/usr.bin/gcore/elfcore.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include