1 files changed, 3 insertions, 2 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ac4f8c6b5c10..1a889c3fec59 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1333,7 +1333,7 @@ nofail_alloc:
         reclaim_state.reclaimed_slab = 0;
         p->reclaim_state = &reclaim_state;
 
-        did_some_progress = try_to_free_pages(zonelist->zones, gfp_mask);
+        did_some_progress = try_to_free_pages(zonelist->zones, order, gfp_mask);
 
         p->reclaim_state = NULL;
         p->flags &= ~PF_MEMALLOC;
@@ -1370,7 +1370,8 @@ nofail_alloc:
          */
         do_retry = 0;
         if (!(gfp_mask & __GFP_NORETRY)) {
-                if ((order <= 3) || (gfp_mask & __GFP_REPEAT))
+                if ((order <= PAGE_ALLOC_COSTLY_ORDER) ||
+                                                (gfp_mask & __GFP_REPEAT))
                         do_retry = 1;
                 if (gfp_mask & __GFP_NOFAIL)
                         do_retry = 1;