summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2008-07-14 14:00:00 +0000
committermiod <miod@openbsd.org>2008-07-14 14:00:00 +0000
commit6f6e825df5ee79ab582f604f53b7c0fec447470d (patch)
treee58e46c3f5445cd1311647a32960d0bd6dc21f60
parentBe sure to propagate PSL_O in psw on PCXU* processors to userland processes (diff)
downloadwireguard-openbsd-6f6e825df5ee79ab582f604f53b7c0fec447470d.tar.xz
wireguard-openbsd-6f6e825df5ee79ab582f604f53b7c0fec447470d.zip
Use uvm_km_valloc_prefer_wait() instead of uvm_km_valloc_wait() in vmapbuf().
ok art@
-rw-r--r--sys/arch/sh/sh/vm_machdep.c4
-rw-r--r--sys/arch/sparc64/sparc64/vm_machdep.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/sh/sh/vm_machdep.c b/sys/arch/sh/sh/vm_machdep.c
index a5b332decf4..52c80f28e1a 100644
--- a/sys/arch/sh/sh/vm_machdep.c
+++ b/sys/arch/sh/sh/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.9 2007/05/27 20:59:26 miod Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.10 2008/07/14 14:00:00 miod Exp $ */
/* $NetBSD: vm_machdep.c,v 1.53 2006/08/31 16:49:21 matt Exp $ */
/*
@@ -322,7 +322,7 @@ vmapbuf(struct buf *bp, vsize_t len)
faddr = trunc_page((vaddr_t)bp->b_data);
off = (vaddr_t)bp->b_data - faddr;
len = round_page(off + len);
- taddr = uvm_km_valloc_wait(phys_map, len);
+ taddr = uvm_km_valloc_prefer_wait(phys_map, len, faddr);
bp->b_data = (caddr_t)(taddr + off);
/*
* The region is locked, so we expect that pmap_pte() will return
diff --git a/sys/arch/sparc64/sparc64/vm_machdep.c b/sys/arch/sparc64/sparc64/vm_machdep.c
index 4e940cd1bde..bac9a8a6816 100644
--- a/sys/arch/sparc64/sparc64/vm_machdep.c
+++ b/sys/arch/sparc64/sparc64/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.24 2008/03/15 22:05:51 kettenis Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.25 2008/07/14 14:00:01 miod Exp $ */
/* $NetBSD: vm_machdep.c,v 1.38 2001/06/30 00:02:20 eeh Exp $ */
/*
@@ -96,7 +96,7 @@ vmapbuf(bp, len)
uva = trunc_page((vaddr_t)bp->b_data);
off = (vaddr_t)bp->b_data - uva;
len = round_page(off + len);
- kva = uvm_km_valloc_wait(kernel_map, len);
+ kva = uvm_km_valloc_prefer_wait(kernel_map, len, uva);
bp->b_data = (caddr_t)(kva + off);
/*