diff options
| author | Ariane van der Steldt <ariane@cvs.openbsd.org> | 2011-06-06 17:10:24 +0000 |
|---|---|---|
| committer | Ariane van der Steldt <ariane@cvs.openbsd.org> | 2011-06-06 17:10:24 +0000 |
| commit | 100bcabc80107e37b8efd45890258b7852cfc054 (patch) | |
| tree | e8b5e2a61d1db84e157951ce84c29f939b88c036 /sys/kern/kern_malloc.c | |
| parent | d2a285457d0c89bdbfc900ff091099f892e0e4f4 (diff) | |
Backout vmmap in order to repair virtual address selection algorithms
outside the tree.
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 2912fd97c4c..adce9cc787d 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.88 2011/06/06 17:05:46 deraadt Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.89 2011/06/06 17:10:23 ariane Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -576,13 +576,8 @@ kmeminit(void) kmeminit_nkmempages(); base = vm_map_min(kernel_map); kmem_map = uvm_km_suballoc(kernel_map, &base, &limit, - (vsize_t)(nkmempages * PAGE_SIZE), -#ifdef KVA_GUARDPAGES - VM_MAP_INTRSAFE | VM_MAP_GUARDPAGES, -#else - VM_MAP_INTRSAFE, -#endif - FALSE, &kmem_map_store); + (vsize_t)(nkmempages * PAGE_SIZE), VM_MAP_INTRSAFE, FALSE, + &kmem_map_store); kmembase = (char *)base; kmemlimit = (char *)limit; kmemusage = (struct kmemusage *) uvm_km_zalloc(kernel_map, |