aboutsummaryrefslogtreecommitdiffstats
path: root/mm/hugetlb.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r--mm/hugetlb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index c01cb9fedb18..139b7462203b 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -540,7 +540,7 @@ static struct page *dequeue_huge_page_vma(struct hstate *h,
540 goto err; 540 goto err;
541 541
542retry_cpuset: 542retry_cpuset:
543 cpuset_mems_cookie = get_mems_allowed(); 543 cpuset_mems_cookie = read_mems_allowed_begin();
544 zonelist = huge_zonelist(vma, address, 544 zonelist = huge_zonelist(vma, address,
545 htlb_alloc_mask(h), &mpol, &nodemask); 545 htlb_alloc_mask(h), &mpol, &nodemask);
546 546
@@ -562,7 +562,7 @@ retry_cpuset:
562 } 562 }
563 563
564 mpol_cond_put(mpol); 564 mpol_cond_put(mpol);
565 if (unlikely(!put_mems_allowed(cpuset_mems_cookie) && !page)) 565 if (unlikely(!page && read_mems_allowed_retry(cpuset_mems_cookie)))
566 goto retry_cpuset; 566 goto retry_cpuset;
567 return page; 567 return page;
568 568