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.h | |
| 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.h')
| -rw-r--r-- | sys/uvm/uvm_map.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/uvm/uvm_map.h b/sys/uvm/uvm_map.h index 40ad444cac8..951c282cfd7 100644 --- a/sys/uvm/uvm_map.h +++ b/sys/uvm/uvm_map.h @@ -1,5 +1,5 @@ -/* $OpenBSD: uvm_map.h,v 1.11 2001/11/06 00:27:01 art Exp $ */ -/* $NetBSD: uvm_map.h,v 1.19 2000/06/26 17:18:40 mrg Exp $ */ +/* $OpenBSD: uvm_map.h,v 1.12 2001/11/06 13:36:52 art Exp $ */ +/* $NetBSD: uvm_map.h,v 1.21 2000/08/16 16:32:06 thorpej Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -240,7 +240,6 @@ struct vm_map { #define VM_MAP_WANTLOCK 0x10 /* rw: want to write-lock */ /* XXX: number of kernel maps and entries to statically allocate */ -#define MAX_KMAP 10 #if !defined(MAX_KMAPENT) #if (50 + (2 * NPROC) > 1000) @@ -425,11 +424,9 @@ vm_map_lock(map) try_again: simple_lock(&map->flags_lock); - if (map->flags & VM_MAP_BUSY) { + while (map->flags & VM_MAP_BUSY) { map->flags |= VM_MAP_WANTLOCK; - simple_unlock(&map->flags_lock); - (void) tsleep(&map->flags, PVM, "vmmapbsy", 0); - goto try_again; + ltsleep(&map->flags, PVM, "vmmapbsy", 0, &map->flags_lock); } error = lockmgr(&map->lock, LK_EXCLUSIVE|LK_SLEEPFAIL|LK_INTERLOCK, |