1 files changed, 5 insertions, 3 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 5488c54b1172..29851841da62 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3243,6 +3243,8 @@ static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
         struct zonelist *zonelist;
         gfp_t local_flags;
         struct zone **z;
+        struct zone *zone;
+        enum zone_type high_zoneidx = gfp_zone(flags);
         void *obj = NULL;
         int nid;
 
@@ -3257,10 +3259,10 @@ retry:
          * Look through allowed nodes for objects available
          * from existing per node queues.
          */
-        for (z = zonelist->zones; *z && !obj; z++) {
-                nid = zone_to_nid(*z);
+        for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
+                nid = zone_to_nid(zone);
 
-                if (cpuset_zone_allowed_hardwall(*z, flags) &&
+                if (cpuset_zone_allowed_hardwall(zone, flags) &&
                         cache->nodelists[nid] &&
                         cache->nodelists[nid]->free_objects)
                                 obj = ____cache_alloc_node(cache,