diff options
| author | Hugh Dickins <hughd@google.com> | 2012-03-23 10:57:31 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 16:34:40 +0100 |
| commit | 643ac9fc5429e85b8b7f534544b80bcc4f34c367 (patch) | |
| tree | f6db7d7e8a08761119d478ef7adf5bef4402f786 /mm/vmscan.c | |
| parent | Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6 (diff) | |
| download | linux-643ac9fc5429e85b8b7f534544b80bcc4f34c367.tar.xz linux-643ac9fc5429e85b8b7f534544b80bcc4f34c367.zip | |
mm: fix testorder interaction between two kswapd patches
Adjusting cc715d99e529 "mm: vmscan: forcibly scan highmem if there are
too many buffer_heads pinning highmem" for -stable reveals that it was
slightly wrong once on top of fe2c2a106663 "vmscan: reclaim at order 0
when compaction is enabled", which specifically adds testorder for the
zone_watermark_ok_safe() test.
Signed-off-by: Hugh Dickins <hughd@google.com>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Acked-by: Rik van Riel <riel@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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 49f15ef0a99a..7658fd6536dd 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2817,7 +2817,7 @@ loop_again: testorder = 0; if ((buffer_heads_over_limit && is_highmem_idx(i)) || - !zone_watermark_ok_safe(zone, order, + !zone_watermark_ok_safe(zone, testorder, high_wmark_pages(zone) + balance_gap, end_zone, 0)) { shrink_zone(priority, zone, &sc); |