Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes

[karo-tx-linux.git] / mm / mmzone.c

diff --git a/mm/mmzone.c b/mm/mmzone.c
index 5652be858e5e320c7a748d4e6a407c66baaa62a0..a51c0a67ea3d3725369c88a23340d2fc745e0e62 100644 (file)
--- a/mm/mmzone.c
+++ b/mm/mmzone.c
@@ -60,7 +60,7 @@ struct zoneref *__next_zones_zonelist(struct zoneref *z,
         * Find the next suitable zone to use for the allocation.
         * Only filter based on nodemask if it's set
         */
-       if (likely(nodes == NULL))
+       if (unlikely(nodes == NULL))
                while (zonelist_zone_idx(z) > highest_zoneidx)
                        z++;
        else