aboutsummaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ef870fb92f74..94f33e2b7f0b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1616,14 +1616,16 @@ gfp_to_alloc_flags(gfp_t gfp_mask)
1616 int alloc_flags = ALLOC_WMARK_MIN | ALLOC_CPUSET; 1616 int alloc_flags = ALLOC_WMARK_MIN | ALLOC_CPUSET;
1617 const gfp_t wait = gfp_mask & __GFP_WAIT; 1617 const gfp_t wait = gfp_mask & __GFP_WAIT;
1618 1618
1619 /* __GFP_HIGH is assumed to be the same as ALLOC_HIGH to save a branch. */
1620 BUILD_BUG_ON(__GFP_HIGH != ALLOC_HIGH);
1621
1619 /* 1622 /*
1620 * The caller may dip into page reserves a bit more if the caller 1623 * The caller may dip into page reserves a bit more if the caller
1621 * cannot run direct reclaim, or if the caller has realtime scheduling 1624 * cannot run direct reclaim, or if the caller has realtime scheduling
1622 * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will 1625 * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will
1623 * set both ALLOC_HARDER (!wait) and ALLOC_HIGH (__GFP_HIGH). 1626 * set both ALLOC_HARDER (!wait) and ALLOC_HIGH (__GFP_HIGH).
1624 */ 1627 */
1625 if (gfp_mask & __GFP_HIGH) 1628 alloc_flags |= (gfp_mask & __GFP_HIGH);
1626 alloc_flags |= ALLOC_HIGH;
1627 1629
1628 if (!wait) { 1630 if (!wait) {
1629 alloc_flags |= ALLOC_HARDER; 1631 alloc_flags |= ALLOC_HARDER;