From 95ba617d98b50d9005c23e8613fcb73d73e41e2d Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Mon, 9 Aug 2010 17:19:29 -0700 Subject: [PATCH] --- yaml --- r: 207248 b: refs/heads/master c: d4debc66d1fc1b98a68081c4c8156f171841dca8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7fc7f0b84a7a..3a4f8f999f96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e247dbce5cc747a714e8dcbd6b3f442cc2a284cf +refs/heads/master: d4debc66d1fc1b98a68081c4c8156f171841dca8 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 8522327bd04f..7f25f336551a 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -1728,13 +1728,12 @@ static void shrink_zone(int priority, struct zone *zone, static bool shrink_zones(int priority, struct zonelist *zonelist, struct scan_control *sc) { - enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask); struct zoneref *z; struct zone *zone; bool all_unreclaimable = true; - for_each_zone_zonelist_nodemask(zone, z, zonelist, high_zoneidx, - sc->nodemask) { + for_each_zone_zonelist_nodemask(zone, z, zonelist, + gfp_zone(sc->gfp_mask), sc->nodemask) { if (!populated_zone(zone)) continue; /* @@ -1779,7 +1778,6 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist, struct reclaim_state *reclaim_state = current->reclaim_state; struct zoneref *z; struct zone *zone; - enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask); unsigned long writeback_threshold; get_mems_allowed(); @@ -1799,7 +1797,8 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist, */ if (scanning_global_lru(sc)) { unsigned long lru_pages = 0; - for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) { + for_each_zone_zonelist(zone, z, zonelist, + gfp_zone(sc->gfp_mask)) { if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL)) continue;