diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2019-12-02 14:01:27 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2019-12-02 14:01:27 +0000 |
| commit | 13410d8d7540eaf3ede8c451ff69b436275368cd (patch) | |
| tree | 4368406340a16ac950469a0c07f78ca325e23ca0 /sys | |
| parent | 7b7de0602680d241a26baadc4f0b6ef50a7db77e (diff) | |
Stop supporting UVM_FLAG_TRYLOCK in uvm_mapanon(), it is not used.
ok tedu@, visa@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/uvm/uvm_map.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c index 65cfb4575d5..6dadd67442f 100644 --- a/sys/uvm/uvm_map.c +++ b/sys/uvm/uvm_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_map.c,v 1.254 2019/11/30 23:15:54 deraadt Exp $ */ +/* $OpenBSD: uvm_map.c,v 1.255 2019/12/02 14:01:26 mpi Exp $ */ /* $NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $ */ /* @@ -951,9 +951,9 @@ uvm_mapanon(struct vm_map *map, vaddr_t *addr, vsize_t sz, KASSERT((map->flags & VM_MAP_ISVMSPACE) == VM_MAP_ISVMSPACE); KASSERT(map != kernel_map); KASSERT((map->flags & UVM_FLAG_HOLE) == 0); - KASSERT((map->flags & VM_MAP_INTRSAFE) == 0); splassert(IPL_NONE); + KASSERT((flags & UVM_FLAG_TRYLOCK) == 0); /* * We use pmap_align and pmap_offset as alignment and offset variables. @@ -989,14 +989,7 @@ uvm_mapanon(struct vm_map *map, vaddr_t *addr, vsize_t sz, if (new == NULL) return(ENOMEM); - if (flags & UVM_FLAG_TRYLOCK) { - if (vm_map_lock_try(map) == FALSE) { - error = EFAULT; - goto out; - } - } else - vm_map_lock(map); - + vm_map_lock(map); first = last = NULL; if (flags & UVM_FLAG_FIXED) { /* @@ -1118,7 +1111,7 @@ unlock: * destroy free-space entries. */ uvm_unmap_detach(&dead, 0); -out: + if (new) uvm_mapent_free(new); return error; |