Merge tag 'md/3.20' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / mm / mmzone.c

diff --git a/mm/mmzone.c b/mm/mmzone.c
index bf34fb8556db0a5b3805ec97137ae9ee1a3045f9..7d87ebb0d63249ead3ff2f3e2f0b096b590cafaf 100644 (file)
--- a/mm/mmzone.c
+++ b/mm/mmzone.c
@@ -54,8 +54,7 @@ static inline int zref_in_nodemask(struct zoneref *zref, nodemask_t *nodes)
 /* Returns the next zone at or below highest_zoneidx in a zonelist */
 struct zoneref *next_zones_zonelist(struct zoneref *z,
                                        enum zone_type highest_zoneidx,
-                                       nodemask_t *nodes,
-                                       struct zone **zone)
+                                       nodemask_t *nodes)
 {
        /*
         * Find the next suitable zone to use for the allocation.
@@ -69,7 +68,6 @@ struct zoneref *next_zones_zonelist(struct zoneref *z,
                                (z->zone && !zref_in_nodemask(z, nodes)))
                        z++;
 
-       *zone = zonelist_zone(z);
        return z;
 }