Index: sys/kern/kern_malloc.c
===================================================================
RCS file: /mount/openbsd/cvs/src/sys/kern/kern_malloc.c,v
retrieving revision 1.144
diff -u -p -u -p -r1.144 kern_malloc.c
--- sys/kern/kern_malloc.c	23 Feb 2021 13:50:16 -0000	1.144
+++ sys/kern/kern_malloc.c	27 Mar 2021 11:10:01 -0000
@@ -580,8 +580,8 @@ kmeminit(void)
 	    FALSE, &kmem_map_store);
 	kmembase = (char *)base;
 	kmemlimit = (char *)limit;
-	kmemusage = (struct kmemusage *) uvm_km_zalloc(kernel_map,
-		(vsize_t)(nkmempages * sizeof(struct kmemusage)));
+	kmemusage = km_alloc(round_page(nkmempages * sizeof(struct kmemusage)),
+	    &kv_any, &kp_zero, &kd_waitok);
 	for (indx = 0; indx < MINBUCKET + 16; indx++) {
 		XSIMPLEQ_INIT(&bucket[indx].kb_freelist);
 	}
Index: sys/uvm/uvm_page.c
===================================================================
RCS file: /mount/openbsd/cvs/src/sys/uvm/uvm_page.c,v
retrieving revision 1.156
diff -u -p -u -p -r1.156 uvm_page.c
--- sys/uvm/uvm_page.c	26 Mar 2021 13:40:05 -0000	1.156
+++ sys/uvm/uvm_page.c	27 Mar 2021 11:10:01 -0000
@@ -542,8 +542,8 @@ uvm_page_physload(paddr_t start, paddr_t
 
  		npages = end - start;  /* # of pages */
 
-		pgs = (struct vm_page *)uvm_km_zalloc(kernel_map,
-		    npages * sizeof(*pgs));
+		pgs = km_alloc(npages * sizeof(*pgs), &kv_any, &kp_zero,
+		    &kd_waitok);
 		if (pgs == NULL) {
 			printf("uvm_page_physload: can not malloc vm_page "
 			    "structs for segment\n");