2 files changed, 14 insertions, 10 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 14d7032c1d12..3974fd81d27c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -806,11 +806,14 @@ __alloc_pages(unsigned int __nocast gfp_mask, unsigned int order,
         classzone_idx = zone_idx(zones[0]);
 
 restart:
-        /* Go through the zonelist once, looking for a zone with enough free */
+        /*
+         * Go through the zonelist once, looking for a zone with enough free.
+         * See also cpuset_zone_allowed() comment in kernel/cpuset.c.
+         */
         for (i = 0; (z = zones[i]) != NULL; i++) {
                 int do_reclaim = should_reclaim_zone(z, gfp_mask);
 
-                if (!cpuset_zone_allowed(z))
+                if (!cpuset_zone_allowed(z, __GFP_HARDWALL))
                         continue;
 
                 /*
@@ -845,6 +848,7 @@ zone_reclaim_retry:
          *
          * This is the last chance, in general, before the goto nopage.
          * Ignore cpuset if GFP_ATOMIC (!wait) rather than fail alloc.
+         * See also cpuset_zone_allowed() comment in kernel/cpuset.c.
          */
         for (i = 0; (z = zones[i]) != NULL; i++) {
                 if (!zone_watermark_ok(z, order, z->pages_min,
@@ -852,7 +856,7 @@ zone_reclaim_retry:
                                        gfp_mask & __GFP_HIGH))
                         continue;
 
-                if (wait && !cpuset_zone_allowed(z))
+                if (wait && !cpuset_zone_allowed(z, gfp_mask))
                         continue;
 
                 page = buffered_rmqueue(z, order, gfp_mask);
@@ -867,7 +871,7 @@ zone_reclaim_retry:
                 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))
+                                if (!cpuset_zone_allowed(z, gfp_mask))
                                         continue;
                                 page = buffered_rmqueue(z, order, gfp_mask);
                                 if (page)
@@ -903,7 +907,7 @@ rebalance:
                                                gfp_mask & __GFP_HIGH))
                                 continue;
 
-                        if (!cpuset_zone_allowed(z))
+                        if (!cpuset_zone_allowed(z, gfp_mask))
                                 continue;
 
                         page = buffered_rmqueue(z, order, gfp_mask);
@@ -922,7 +926,7 @@ rebalance:
                                                classzone_idx, 0, 0))
                                 continue;
 
-                        if (!cpuset_zone_allowed(z))
+                        if (!cpuset_zone_allowed(z, __GFP_HARDWALL))
                                 continue;
 
                         page = buffered_rmqueue(z, order, gfp_mask);
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 0095533cdde9..a740778f688d 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -894,7 +894,7 @@ shrink_caches(struct zone **zones, struct scan_control *sc)
                 if (zone->present_pages == 0)
                         continue;
 
-                if (!cpuset_zone_allowed(zone))
+                if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
                         continue;
 
                 zone->temp_priority = sc->priority;
@@ -940,7 +940,7 @@ int try_to_free_pages(struct zone **zones, unsigned int gfp_mask)
         for (i = 0; zones[i] != NULL; i++) {
                 struct zone *zone = zones[i];
 
-                if (!cpuset_zone_allowed(zone))
+                if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
                         continue;
 
                 zone->temp_priority = DEF_PRIORITY;
@@ -986,7 +986,7 @@ out:
         for (i = 0; zones[i] != 0; i++) {
                 struct zone *zone = zones[i];
 
-                if (!cpuset_zone_allowed(zone))
+                if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
                         continue;
 
                 zone->prev_priority = zone->temp_priority;
@@ -1256,7 +1256,7 @@ void wakeup_kswapd(struct zone *zone, int order)
                 return;
         if (pgdat->kswapd_max_order < order)
                 pgdat->kswapd_max_order = order;
-        if (!cpuset_zone_allowed(zone))
+        if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
                 return;
         if (!waitqueue_active(&zone->zone_pgdat->kswapd_wait))
                 return;