diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-11-06 13:36:53 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-11-06 13:36:53 +0000 |
| commit | dce408d18a14842aa7836a626a151e98665f04e7 (patch) | |
| tree | a3ddb948fd94211a9af9df05d8de6c60a2081605 /sys/uvm/uvm_map.c | |
| parent | 789e8c48d1472795faa6a959068b32a1749b315d (diff) | |
More sync to NetBSD.
- Use malloc/free instead of MALLOC/FREE for variable sized allocations.
- Move the memory inheritance code to sys/mman.h and rename from VM_* to MAP_*
- various cleanups and simplifications.
Diffstat (limited to 'sys/uvm/uvm_map.c')
| -rw-r--r-- | sys/uvm/uvm_map.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c index 6144ef4a222..b754d9ccde4 100644 --- a/sys/uvm/uvm_map.c +++ b/sys/uvm/uvm_map.c @@ -1,5 +1,5 @@ -/* $OpenBSD: uvm_map.c,v 1.26 2001/11/06 01:35:04 art Exp $ */ -/* $NetBSD: uvm_map.c,v 1.79 2000/06/27 17:29:26 mrg Exp $ */ +/* $OpenBSD: uvm_map.c,v 1.27 2001/11/06 13:36:52 art Exp $ */ +/* $NetBSD: uvm_map.c,v 1.80 2000/08/01 00:53:11 wiz Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -1841,9 +1841,9 @@ uvm_map_inherit(map, start, end, new_inheritance) map, start, end, new_inheritance); switch (new_inheritance) { - case VM_INHERIT_NONE: - case VM_INHERIT_COPY: - case VM_INHERIT_SHARE: + case MAP_INHERIT_NONE: + case MAP_INHERIT_COPY: + case MAP_INHERIT_SHARE: break; default: UVMHIST_LOG(maphist,"<- done (INVALID ARG)",0,0,0,0); @@ -2930,13 +2930,13 @@ uvmspace_fork(vm1) switch (old_entry->inheritance) { - case VM_INHERIT_NONE: + case MAP_INHERIT_NONE: /* * drop the mapping */ break; - case VM_INHERIT_SHARE: + case MAP_INHERIT_SHARE: /* * share the mapping: this means we want the old and * new entries to share amaps and backing objects. @@ -2993,7 +2993,7 @@ uvmspace_fork(vm1) break; - case VM_INHERIT_COPY: + case MAP_INHERIT_COPY: /* * copy-on-write the mapping (using mmap's |