Merge branch 'next' into for-linus

Second round of updates for 3.20.

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index ab2505c3ef54..dcd90c891d8e 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2656,7 +2656,7 @@ static bool throttle_direct_reclaim(gfp_t gfp_mask, struct zonelist *zonelist,
          * should make reasonable progress.
          */
         for_each_zone_zonelist_nodemask(zone, z, zonelist,
-                                        gfp_mask, nodemask) {
+                                        gfp_zone(gfp_mask), nodemask) {
                 if (zone_idx(zone) > ZONE_NORMAL)
                         continue;