1 files changed, 8 insertions, 7 deletions

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 2f0856d14b21..f279d9c158cd 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -426,7 +426,7 @@ struct zone {
         const char              *name;
 
         /*
-         * Number of MIGRATE_RESEVE page block. To maintain for just
+         * Number of MIGRATE_RESERVE page block. To maintain for just
          * optimization. Protected by zone->lock.
          */
         int                     nr_migrate_reserve_block;
@@ -970,7 +970,6 @@ static inline int zonelist_node_idx(struct zoneref *zoneref)
  * @z - The cursor used as a starting point for the search
  * @highest_zoneidx - The zone index of the highest zone to return
  * @nodes - An optional nodemask to filter the zonelist with
- * @zone - The first suitable zone found is returned via this parameter
  *
  * This function returns the next zone at or below a given zone index that is
  * within the allowed nodemask using a cursor as the starting point for the
@@ -980,8 +979,7 @@ static inline int zonelist_node_idx(struct zoneref *zoneref)
  */
 struct zoneref *next_zones_zonelist(struct zoneref *z,
                                         enum zone_type highest_zoneidx,
-                                        nodemask_t *nodes,
-                                        struct zone **zone);
+                                        nodemask_t *nodes);
 
 /**
  * first_zones_zonelist - Returns the first zone at or below highest_zoneidx within the allowed nodemask in a zonelist
@@ -1000,8 +998,10 @@ static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,
                                         nodemask_t *nodes,
                                         struct zone **zone)
 {
-        return next_zones_zonelist(zonelist->_zonerefs, highest_zoneidx, nodes,
-                                                                zone);
+        struct zoneref *z = next_zones_zonelist(zonelist->_zonerefs,
+                                                        highest_zoneidx, nodes);
+        *zone = zonelist_zone(z);
+        return z;
 }
 
 /**
@@ -1018,7 +1018,8 @@ static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,
 #define for_each_zone_zonelist_nodemask(zone, z, zlist, highidx, nodemask) \
         for (z = first_zones_zonelist(zlist, highidx, nodemask, &zone); \
                 zone;                                                   \
-                z = next_zones_zonelist(++z, highidx, nodemask, &zone)) \
+                z = next_zones_zonelist(++z, highidx, nodemask),        \
+                        zone = zonelist_zone(z))                        \
 
 /**
  * for_each_zone_zonelist - helper macro to iterate over valid zones in a zonelist at or below a given zone index