summaryrefslogtreecommitdiffstats
path: root/sys/sparc64/sparc64
diff options
context:
space:
mode:
authormarkj <markj@FreeBSD.org>2018-01-10 20:39:26 +0000
committerLuiz Souza <luiz@netgate.com>2018-02-21 15:18:03 -0300
commit05ab1684179efc5baff3db229caf891d546043c3 (patch)
tree0c5bf5d25b5805b2ed18ab70cc199975712210c6 /sys/sparc64/sparc64
parent5d7057db969c65be347887d98320f74442d9aeff (diff)
downloadFreeBSD-src-05ab1684179efc5baff3db229caf891d546043c3.zip
FreeBSD-src-05ab1684179efc5baff3db229caf891d546043c3.tar.gz
MFC r325530 (jeff), r325566 (kib), r325588 (kib):
Replace many instances of VM_WAIT with blocking page allocation flags. (cherry picked from commit 2069f0080fbdcf49b623bc3c1eda76524a4d1a77)
Diffstat (limited to 'sys/sparc64/sparc64')
-rw-r--r--sys/sparc64/sparc64/vm_machdep.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/sys/sparc64/sparc64/vm_machdep.c b/sys/sparc64/sparc64/vm_machdep.c
index a8b244c..10d1d36 100644
--- a/sys/sparc64/sparc64/vm_machdep.c
+++ b/sys/sparc64/sparc64/vm_machdep.c
@@ -394,24 +394,16 @@ uma_small_alloc(uma_zone_t zone, vm_size_t bytes, u_int8_t *flags, int wait)
{
vm_paddr_t pa;
vm_page_t m;
- int pflags;
void *va;
PMAP_STATS_INC(uma_nsmall_alloc);
*flags = UMA_SLAB_PRIV;
- pflags = malloc2vm_flags(wait) | VM_ALLOC_WIRED;
-
- for (;;) {
- m = vm_page_alloc(NULL, 0, pflags | VM_ALLOC_NOOBJ);
- if (m == NULL) {
- if (wait & M_NOWAIT)
- return (NULL);
- else
- VM_WAIT;
- } else
- break;
- }
+
+ m = vm_page_alloc(NULL, 0,
+ malloc2vm_flags(wait) | VM_ALLOC_WIRED | VM_ALLOC_NOOBJ);
+ if (m == NULL)
+ return (NULL);
pa = VM_PAGE_TO_PHYS(m);
if (dcache_color_ignore == 0 && m->md.color != DCACHE_COLOR(pa)) {
OpenPOWER on IntegriCloud