1 files changed, 12 insertions, 8 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 08e8627361a0..04a35b3d3262 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -799,14 +799,18 @@ __alloc_pages(unsigned int __nocast gfp_mask, unsigned int order,
         }
 
         /* This allocation should allow future memory freeing. */
-        if (((p->flags & PF_MEMALLOC) || unlikely(test_thread_flag(TIF_MEMDIE))) && !in_interrupt()) {
-                /* go through the zonelist yet again, ignoring mins */
-                for (i = 0; (z = zones[i]) != NULL; i++) {
-                        if (!cpuset_zone_allowed(z))
-                                continue;
-                        page = buffered_rmqueue(z, order, gfp_mask);
-                        if (page)
-                                goto got_pg;
+
+        if (((p->flags & PF_MEMALLOC) || unlikely(test_thread_flag(TIF_MEMDIE)))
+                        && !in_interrupt()) {
+                if (!(gfp_mask & __GFP_NOMEMALLOC)) {
+                        /* go through the zonelist yet again, ignoring mins */
+                        for (i = 0; (z = zones[i]) != NULL; i++) {
+                                if (!cpuset_zone_allowed(z))
+                                        continue;
+                                page = buffered_rmqueue(z, order, gfp_mask);
+                                if (page)
+                                        goto got_pg;
+                        }
                 }
                 goto nopage;
         }