5 files changed, 8 insertions, 8 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 0ccc7f230252..089092d152ab 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -73,7 +73,7 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma,
 
         for (z = zonelist->zones; *z; z++) {
                 nid = zone_to_nid(*z);
-                if (cpuset_zone_allowed(*z, GFP_HIGHUSER) &&
+                if (cpuset_zone_allowed_softwall(*z, GFP_HIGHUSER) &&
                     !list_empty(&hugepage_freelists[nid]))
                         break;
         }
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 223d9ccb7d64..64cf3c214634 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -177,7 +177,7 @@ static inline int constrained_alloc(struct zonelist *zonelist, gfp_t gfp_mask)
         nodemask_t nodes = node_online_map;
 
         for (z = zonelist->zones; *z; z++)
-                if (cpuset_zone_allowed(*z, gfp_mask))
+                if (cpuset_zone_allowed_softwall(*z, gfp_mask))
                         node_clear(zone_to_nid(*z), nodes);
                 else
                         return CONSTRAINT_CPUSET;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index e6b17b2989e0..8c1a116875bc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1162,7 +1162,7 @@ zonelist_scan:
                         zone->zone_pgdat != zonelist->zones[0]->zone_pgdat))
                                 break;
                 if ((alloc_flags & ALLOC_CPUSET) &&
-                        !cpuset_zone_allowed(zone, gfp_mask))
+                        !cpuset_zone_allowed_softwall(zone, gfp_mask))
                                 goto try_next_zone;
 
                 if (!(alloc_flags & ALLOC_NO_WATERMARKS)) {
diff --git a/mm/slab.c b/mm/slab.c
index 9d3550086c93..b856786a3a30 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3262,7 +3262,7 @@ retry:
         for (z = zonelist->zones; *z && !obj; z++) {
                 nid = zone_to_nid(*z);
 
-                if (cpuset_zone_allowed(*z, flags | __GFP_HARDWALL) &&
+                if (cpuset_zone_allowed_hardwall(*z, flags) &&
                         cache->nodelists[nid] &&
                         cache->nodelists[nid]->free_objects)
                                 obj = ____cache_alloc_node(cache,
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 093f5fe6dd77..e9813b06c7a3 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -984,7 +984,7 @@ static unsigned long shrink_zones(int priority, struct zone **zones,
                 if (!populated_zone(zone))
                         continue;
 
-                if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
+                if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
                         continue;
 
                 note_zone_scanning_priority(zone, priority);
@@ -1034,7 +1034,7 @@ unsigned long try_to_free_pages(struct zone **zones, gfp_t gfp_mask)
         for (i = 0; zones[i] != NULL; i++) {
                 struct zone *zone = zones[i];
 
-                if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
+                if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
                         continue;
 
                 lru_pages += zone->nr_active + zone->nr_inactive;
@@ -1089,7 +1089,7 @@ out:
         for (i = 0; zones[i] != 0; i++) {
                 struct zone *zone = zones[i];
 
-                if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
+                if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
                         continue;
 
                 zone->prev_priority = priority;
@@ -1354,7 +1354,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, __GFP_HARDWALL))
+        if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
                 return;
         if (!waitqueue_active(&pgdat->kswapd_wait))
                 return;