projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: Remove false WARN_ON from pagecache_isize_extended()
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
hugetlb.c
diff --git
a/mm/hugetlb.c
b/mm/hugetlb.c
index
0405368
..
67d0c17
100644
(file)
--- a/
mm/hugetlb.c
+++ b/
mm/hugetlb.c
@@
-540,7
+540,7
@@
static struct page *dequeue_huge_page_vma(struct hstate *h,
goto err;
retry_cpuset:
goto err;
retry_cpuset:
- cpuset_mems_cookie =
get_mems_allowed
();
+ cpuset_mems_cookie =
read_mems_allowed_begin
();
zonelist = huge_zonelist(vma, address,
htlb_alloc_mask(h), &mpol, &nodemask);
zonelist = huge_zonelist(vma, address,
htlb_alloc_mask(h), &mpol, &nodemask);
@@
-562,7
+562,7
@@
retry_cpuset:
}
mpol_cond_put(mpol);
}
mpol_cond_put(mpol);
- if (unlikely(!p
ut_mems_allowed(cpuset_mems_cookie) && !page
))
+ if (unlikely(!p
age && read_mems_allowed_retry(cpuset_mems_cookie)
))
goto retry_cpuset;
return page;
goto retry_cpuset;
return page;