From 0be467f46ad61d25a69d3faf1f782dd63673c4d1 Mon Sep 17 00:00:00 2001
From: kettenis <kettenis@openbsd.org>
Date: Sat, 21 May 2022 23:43:31 +0000
Subject: [PATCH] Convert KVA allocation to km_alloc(9).

ok mpi@
---
 sys/arch/hppa/hppa/vm_machdep.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/sys/arch/hppa/hppa/vm_machdep.c b/sys/arch/hppa/hppa/vm_machdep.c
index afe107dc977..0e8de2c0818 100644
--- a/sys/arch/hppa/hppa/vm_machdep.c
+++ b/sys/arch/hppa/hppa/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.83 2017/07/16 22:47:37 guenther Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.84 2022/05/21 23:43:31 kettenis Exp $	*/
 
 /*
  * Copyright (c) 1999-2004 Michael Shalayeff
@@ -136,12 +136,18 @@ cpu_exit(struct proc *p)
 	sched_exit(p);
 }
 
+struct kmem_va_mode kv_physwait = {
+	.kv_map = &phys_map,
+	.kv_wait = 1,
+};
+
 /*
  * Map an IO request into kernel virtual address space.
  */
 void
 vmapbuf(struct buf *bp, vsize_t len)
 {
+	struct kmem_dyn_mode kd_prefer = { .kd_waitok = 1 };
 	struct pmap *pm = vm_map_pmap(&bp->b_proc->p_vmspace->vm_map);
 	vaddr_t kva, uva;
 	vsize_t size, off;
@@ -155,7 +161,8 @@ vmapbuf(struct buf *bp, vsize_t len)
 	off = (vaddr_t)bp->b_data - uva;
 	size = round_page(off + len);
 
-	kva = uvm_km_valloc_prefer_wait(phys_map, size, uva);
+	kd_prefer.kd_prefer = uva;
+	kva = (vaddr_t)km_alloc(size, &kv_physwait, &kp_none, &kd_prefer);
 	bp->b_data = (caddr_t)(kva + off);
 	while (size > 0) {
 		paddr_t pa;
@@ -188,7 +195,7 @@ vunmapbuf(struct buf *bp, vsize_t len)
 	len = round_page(off + len);
 	pmap_kremove(addr, len);
 	pmap_update(pmap_kernel());
-	uvm_km_free_wakeup(phys_map, addr, len);
+	km_free((void *)addr, len, &kv_physwait, &kp_none);
 	bp->b_data = bp->b_saveaddr;
 	bp->b_saveaddr = NULL;
 }
-- 
2.20.1