Index: sys/arch/arm64/arm64/acpi_machdep.c
===================================================================
RCS file: /mount/openbsd/cvs/src/sys/arch/arm64/arm64/acpi_machdep.c,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 acpi_machdep.c
--- sys/arch/arm64/arm64/acpi_machdep.c	6 Dec 2020 21:19:55 -0000	1.10
+++ sys/arch/arm64/arm64/acpi_machdep.c	18 Dec 2020 09:49:18 -0000
@@ -74,7 +74,8 @@ acpi_map(paddr_t pa, size_t len, struct 
 {
 	paddr_t pgpa = trunc_page(pa);
 	paddr_t endpa = round_page(pa + len);
-	vaddr_t va = uvm_km_valloc(kernel_map, endpa - pgpa);
+	vaddr_t va = (vaddr_t)km_alloc(endpa - pgpa, &kv_any, &kp_none,
+	    &kd_nowait);
 
 	if (va == 0)
 		return (ENOMEM);
@@ -97,7 +98,7 @@ void
 acpi_unmap(struct acpi_mem_map *handle)
 {
 	pmap_kremove(handle->baseva, handle->vsize);
-	uvm_km_free(kernel_map, handle->baseva, handle->vsize);
+	km_free((void *)handle->baseva, handle->vsize, &kv_any, &kp_none);
 }
 
 int
Index: sys/arch/i386/i386/acpi_machdep.c
===================================================================
RCS file: /mount/openbsd/cvs/src/sys/arch/i386/i386/acpi_machdep.c,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 acpi_machdep.c
--- sys/arch/i386/i386/acpi_machdep.c	21 Jul 2020 03:48:06 -0000	1.74
+++ sys/arch/i386/i386/acpi_machdep.c	18 Dec 2020 09:49:18 -0000
@@ -117,7 +117,8 @@ acpi_map(paddr_t pa, size_t len, struct 
 {
 	paddr_t pgpa = trunc_page(pa);
 	paddr_t endpa = round_page(pa + len);
-	vaddr_t va = uvm_km_valloc(kernel_map, endpa - pgpa);
+	vaddr_t va = (vaddr_t)km_alloc(endpa - pgpa, &kv_any, &kp_none,
+	    &kd_nowait);
 
 	if (va == 0)
 		return (ENOMEM);
@@ -140,7 +141,7 @@ void
 acpi_unmap(struct acpi_mem_map *handle)
 {
 	pmap_kremove(handle->baseva, handle->vsize);
-	uvm_km_free(kernel_map, handle->baseva, handle->vsize);
+	km_free((void *)handle->baseva, handle->vsize, &kv_any, &kp_none);
 }
 
 int