diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2014-10-25 16:57:59 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2014-10-25 16:57:59 +0000 |
| commit | 1bdca64995da38e6de8b97383c960b1fa1d13185 (patch) | |
| tree | 23f3d839c9883737488447c1e37fe17ae418ee7d | |
| parent | 7fa208a673b20df91920e7f762125adc304014dc (diff) | |
uvm_km_valloc -> km_alloc
ok mpi@
| -rw-r--r-- | sys/arch/amd64/amd64/bus_space.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/amd64/amd64/bus_space.c b/sys/arch/amd64/amd64/bus_space.c index eca39be4e64..3b8a345d427 100644 --- a/sys/arch/amd64/amd64/bus_space.c +++ b/sys/arch/amd64/amd64/bus_space.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_space.c,v 1.23 2014/03/29 18:09:28 guenther Exp $ */ +/* $OpenBSD: bus_space.c,v 1.24 2014/10/25 16:57:58 kettenis Exp $ */ /* $NetBSD: bus_space.c,v 1.2 2003/03/14 18:47:53 christos Exp $ */ /*- @@ -495,7 +495,7 @@ x86_mem_add_mapping(bus_addr_t bpa, bus_size_t size, int flags, map_size = endpa - pa; - va = uvm_km_valloc(kernel_map, map_size); + va = (vaddr_t)km_alloc(map_size, &kv_any, &kp_none, &kd_nowait); if (va == 0) return (ENOMEM); @@ -559,7 +559,7 @@ _bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size, /* * Free the kernel virtual mapping. */ - uvm_km_free(kernel_map, va, endva - va); + km_free((void *)va, endva - va, &kv_any, &kp_none); } else panic("bus_space_unmap: bad bus space tag"); @@ -604,7 +604,7 @@ bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size) /* * Free the kernel virtual mapping. */ - uvm_km_free(kernel_map, va, endva - va); + km_free((void *)va, endva - va, &kv_any, &kp_none); } else panic("bus_space_unmap: bad bus space tag"); diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index f116c05a8bf..0bea2b603e2 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.555 2014/10/17 20:37:57 sthen Exp $ */ +/* $OpenBSD: machdep.c,v 1.556 2014/10/25 16:57:58 kettenis Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -3726,7 +3726,7 @@ bus_mem_add_mapping(bus_addr_t bpa, bus_size_t size, int flags, map_size = endpa - pa; - va = uvm_km_valloc(kernel_map, map_size); + va = (vaddr_t)km_alloc(map_size, &kv_any, &kp_none, &kd_nowait); if (va == 0) return (ENOMEM); @@ -3782,7 +3782,7 @@ bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size) /* * Free the kernel virtual mapping. */ - uvm_km_free(kernel_map, va, endva - va); + km_free((void *)va, endva - va, &kv_any, &kp_none); } else panic("bus_space_unmap: bad bus space tag"); @@ -3829,7 +3829,7 @@ _bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size, /* * Free the kernel virtual mapping. */ - uvm_km_free(kernel_map, va, endva - va); + km_free((void *)va, endva - va, &kv_any, &kp_none); } else panic("bus_space_unmap: bad bus space tag"); |