diff options
| -rw-r--r-- | sys/kern/imgact_aout.c | 6 | ||||
| -rw-r--r-- | sys/kern/imgact_elf.c | 6 | ||||
| -rw-r--r-- | sys/vm/vm_map.c | 8 | ||||
| -rw-r--r-- | sys/vm/vm_map.h | 8 | ||||
| -rw-r--r-- | sys/vm/vm_mmap.c | 4 |
5 files changed, 15 insertions, 17 deletions
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index 8378f4385278..f01a6c1a048e 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: imgact_aout.c,v 1.49 1999/04/03 22:20:01 jdp Exp $ + * $Id: imgact_aout.c,v 1.50 1999/05/09 16:04:06 peter Exp $ */ #include <sys/param.h> @@ -190,7 +190,7 @@ exec_aout_imgact(imgp) file_offset, virtual_offset, text_end, VM_PROT_READ | VM_PROT_EXECUTE, VM_PROT_ALL, - MAP_COPY_NEEDED | MAP_COPY_ON_WRITE); + MAP_COPY_ON_WRITE); if (error) { vm_map_unlock(map); return (error); @@ -202,7 +202,7 @@ exec_aout_imgact(imgp) file_offset + a_out->a_text, text_end, data_end, VM_PROT_ALL, VM_PROT_ALL, - MAP_COPY_NEEDED | MAP_COPY_ON_WRITE); + MAP_COPY_ON_WRITE); if (error) { vm_map_unlock(map); return (error); diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index c1fef52eedfc..2934b94834bb 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_elf.c,v 1.55 1999/02/20 23:52:34 jdp Exp $ + * $Id: imgact_elf.c,v 1.56 1999/05/09 16:04:08 peter Exp $ */ #include "opt_rlimit.h" @@ -220,7 +220,7 @@ elf_load_section(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_o map_addr + map_len,/* virtual end */ prot, VM_PROT_ALL, - MAP_COPY_NEEDED | MAP_COPY_ON_WRITE); + MAP_COPY_ON_WRITE); vm_map_unlock(&vmspace->vm_map); if (rv != KERN_SUCCESS) return EINVAL; @@ -270,7 +270,7 @@ elf_load_section(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_o TRUE, VM_PROT_READ, VM_PROT_ALL, - MAP_COPY_ON_WRITE | MAP_COPY_NEEDED); + MAP_COPY_ON_WRITE); if (rv != KERN_SUCCESS) { vm_object_deallocate(object); return EINVAL; diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index f065a8055191..f43164ed94d1 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.c,v 1.159 1999/03/27 23:46:04 alc Exp $ + * $Id: vm_map.c,v 1.160 1999/04/04 07:11:02 alc Exp $ */ /* @@ -462,11 +462,9 @@ vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset, return (KERN_NO_SPACE); protoeflags = 0; - if (cow & MAP_COPY_NEEDED) - protoeflags |= MAP_ENTRY_NEEDS_COPY; if (cow & MAP_COPY_ON_WRITE) - protoeflags |= MAP_ENTRY_COW; + protoeflags |= MAP_ENTRY_COW|MAP_ENTRY_NEEDS_COPY; if (cow & MAP_NOFAULT) protoeflags |= MAP_ENTRY_NOFAULT; @@ -2806,7 +2804,7 @@ vm_uiomove(mapa, srcobject, cp, cnta, uaddra, npages) ooffset = cp; rv = vm_map_insert(map, object, ooffset, start, tend, - VM_PROT_ALL, VM_PROT_ALL, MAP_COPY_ON_WRITE|MAP_COPY_NEEDED); + VM_PROT_ALL, VM_PROT_ALL, MAP_COPY_ON_WRITE); if (rv != KERN_SUCCESS) panic("vm_uiomove: could not insert new entry: %d", rv); diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 330c24a6daba..871934bcd09d 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.h,v 1.37 1999/03/02 05:43:18 alc Exp $ + * $Id: vm_map.h,v 1.38 1999/03/06 07:11:33 alc Exp $ */ /* @@ -305,9 +305,9 @@ vmspace_resident_count(struct vmspace *vmspace) /* * Copy-on-write flags for vm_map operations */ -#define MAP_COPY_NEEDED 0x1 -#define MAP_COPY_ON_WRITE 0x2 -#define MAP_NOFAULT 0x4 +#define MAP_UNUSED_01 0x1 +#define MAP_COPY_ON_WRITE 0x2 +#define MAP_NOFAULT 0x4 /* * vm_fault option flags diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 5c5157a6889c..3f5cba1d09f4 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ * * @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94 - * $Id: vm_mmap.c,v 1.95 1999/05/06 00:46:19 luoqi Exp $ + * $Id: vm_mmap.c,v 1.96 1999/05/06 22:06:45 peter Exp $ */ /* @@ -1040,7 +1040,7 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, docow = 0; if ((flags & (MAP_ANON|MAP_SHARED)) == 0) { - docow = MAP_COPY_ON_WRITE | MAP_COPY_NEEDED; + docow = MAP_COPY_ON_WRITE; } #if defined(VM_PROT_READ_IS_EXEC) |