diff options
| author | Minchan Kim <minchan@kernel.org> | 2016-04-28 16:18:38 -0700 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-05-17 13:42:49 -0400 |
| commit | 978d733ff9e591c384d1d43d89087943a78f9605 (patch) | |
| tree | 66ba3b8359227dfe0ae5e04c44ef80d02c302f47 /mm | |
| parent | 9684dc001e986b11763b30c7bd71c0091fce28f8 (diff) | |
| download | lwn-978d733ff9e591c384d1d43d89087943a78f9605.tar.gz lwn-978d733ff9e591c384d1d43d89087943a78f9605.zip | |
mm: vmscan: reclaim highmem zone if buffer_heads is over limit
[ Upstream commit 7bf52fb891b64b8d61caf0b82060adb9db761aec ]
We have been reclaimed highmem zone if buffer_heads is over limit but
commit 6b4f7799c6a5 ("mm: vmscan: invoke slab shrinkers from
shrink_zone()") changed the behavior so it doesn't reclaim highmem zone
although buffer_heads is over the limit. This patch restores the logic.
Fixes: 6b4f7799c6a5 ("mm: vmscan: invoke slab shrinkers from shrink_zone()")
Signed-off-by: Minchan Kim <minchan@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'mm')
| -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 1a17bd7c0ce5..e1a95dbcd5f8 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2470,7 +2470,7 @@ static bool shrink_zones(struct zonelist *zonelist, struct scan_control *sc) sc->gfp_mask |= __GFP_HIGHMEM; for_each_zone_zonelist_nodemask(zone, z, zonelist, - requested_highidx, sc->nodemask) { + gfp_zone(sc->gfp_mask), sc->nodemask) { enum zone_type classzone_idx; if (!populated_zone(zone)) |