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.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index c95a77cd581b..c5fb017c9430 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1561,7 +1561,7 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
1561 goto out; 1561 goto out;
1562 1562
1563 /* The OOM killer will not help higher order allocs */ 1563 /* The OOM killer will not help higher order allocs */
1564 if (order > PAGE_ALLOC_COSTLY_ORDER) 1564 if (order > PAGE_ALLOC_COSTLY_ORDER && !(gfp_mask & __GFP_NOFAIL))
1565 goto out; 1565 goto out;
1566 1566
1567 /* Exhausted what can be done so it's blamo time */ 1567 /* Exhausted what can be done so it's blamo time */
@@ -1781,11 +1781,13 @@ rebalance:
1781 goto got_pg; 1781 goto got_pg;
1782 1782
1783 /* 1783 /*
1784 * The OOM killer does not trigger for high-order allocations 1784 * The OOM killer does not trigger for high-order
1785 * but if no progress is being made, there are no other 1785 * ~__GFP_NOFAIL allocations so if no progress is being
1786 * options and retrying is unlikely to help 1786 * made, there are no other options and retrying is
1787 * unlikely to help.
1787 */ 1788 */
1788 if (order > PAGE_ALLOC_COSTLY_ORDER) 1789 if (order > PAGE_ALLOC_COSTLY_ORDER &&
1790 !(gfp_mask & __GFP_NOFAIL))
1789 goto nopage; 1791 goto nopage;
1790 1792
1791 goto restart; 1793 goto restart;