diff options
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d0d26da12086..96d48d24e1ef 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -4336,8 +4336,7 @@ static inline bool prepare_alloc_pages(gfp_t gfp_mask, unsigned int order, | |||
4336 | } | 4336 | } |
4337 | 4337 | ||
4338 | /* Determine whether to spread dirty pages and what the first usable zone */ | 4338 | /* Determine whether to spread dirty pages and what the first usable zone */ |
4339 | static inline void finalise_ac(gfp_t gfp_mask, | 4339 | static inline void finalise_ac(gfp_t gfp_mask, struct alloc_context *ac) |
4340 | unsigned int order, struct alloc_context *ac) | ||
4341 | { | 4340 | { |
4342 | /* Dirty zone balancing only done in the fast path */ | 4341 | /* Dirty zone balancing only done in the fast path */ |
4343 | ac->spread_dirty_pages = (gfp_mask & __GFP_WRITE); | 4342 | ac->spread_dirty_pages = (gfp_mask & __GFP_WRITE); |
@@ -4368,7 +4367,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, int preferred_nid, | |||
4368 | if (!prepare_alloc_pages(gfp_mask, order, preferred_nid, nodemask, &ac, &alloc_mask, &alloc_flags)) | 4367 | if (!prepare_alloc_pages(gfp_mask, order, preferred_nid, nodemask, &ac, &alloc_mask, &alloc_flags)) |
4369 | return NULL; | 4368 | return NULL; |
4370 | 4369 | ||
4371 | finalise_ac(gfp_mask, order, &ac); | 4370 | finalise_ac(gfp_mask, &ac); |
4372 | 4371 | ||
4373 | /* First allocation attempt */ | 4372 | /* First allocation attempt */ |
4374 | page = get_page_from_freelist(alloc_mask, order, alloc_flags, &ac); | 4373 | page = get_page_from_freelist(alloc_mask, order, alloc_flags, &ac); |