diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-07-18 12:05:46 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-07-18 12:05:46 +0800 |
| commit | 5289d9c979092878f2bf741d8b365ef7565fb6db (patch) | |
| tree | 845756bb908fddedb3d88515fe0b8d7ad04fc567 /mm/vmscan.c | |
| parent | 91e52df3ad8b9c84c4f6f050e0f14127894dd8ce (diff) | |
| parent | 9e0499d7d30c6a91eb381e604c31519af88737d7 (diff) | |
Merge tag 'v4.4.77' into linux-linaro-lsk-v4.4lsk-v4.4-17.07
This is the 4.4.77 stable release
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index bfc5050cbd01..440c2df9be82 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2529,7 +2529,7 @@ static bool shrink_zones(struct zonelist *zonelist, struct scan_control *sc) if (!populated_zone(zone)) continue; - classzone_idx = requested_highidx; + classzone_idx = gfp_zone(sc->gfp_mask); while (!populated_zone(zone->zone_pgdat->node_zones + classzone_idx)) classzone_idx--; |