[PATCH 08/11] mm: Pass order to __alloc_pages_cpuset_fallback in GFP flags

Matthew Wilcox
2019-05-07T04:06:25Z

Matches the change to the __alloc_pages_nodemask API.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
mm/page_alloc.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cf71547be903..f693fec5f555 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3679,8 +3679,7 @@ void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...)
}

static inline struct page *
-__alloc_pages_cpuset_fallback(gfp_t gfp_mask, unsigned int order,
- unsigned int alloc_flags,
+__alloc_pages_cpuset_fallback(gfp_t gfp_mask, unsigned int alloc_flags,
const struct alloc_context *ac)
{
struct page *page;
@@ -3776,7 +3775,7 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
* reserves
*/
if (gfp_mask & __GFP_NOFAIL)
- page = __alloc_pages_cpuset_fallback(gfp_mask, order,
+ page = __alloc_pages_cpuset_fallback(gfp_mask,
ALLOC_NO_WATERMARKS, ac);
}
out:
@@ -4543,7 +4542,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
* could deplete whole memory reserves which would just make
* the situation worse
*/
- page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_HARDER, ac);
+ page = __alloc_pages_cpuset_fallback(gfp_mask, ALLOC_HARDER, ac);
if (page)
goto got_pg;

--
2.20.1