diff options
| author | Alan Cox <alc@FreeBSD.org> | 1999-05-14 23:09:34 +0000 |
|---|---|---|
| committer | Alan Cox <alc@FreeBSD.org> | 1999-05-14 23:09:34 +0000 |
| commit | e5f13bdd09db5c068f013dcb85b794c797dc5800 (patch) | |
| tree | 418c29bf64f6bbc7d755ece5aa9bb85d85c86222 /sys/vm | |
| parent | 283f072c780578ffc6942307c7a46868da7b963c (diff) | |
Notes
Diffstat (limited to 'sys/vm')
| -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 |
3 files changed, 9 insertions, 11 deletions
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) |