Commit 643ac9fc authored Mar 23, 2012 by Hugh Dickins Committed by Linus Torvalds Mar 23, 2012

mm: fix testorder interaction between two kswapd patches



Adjusting cc715d99 "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 fe2c2a10 "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>

parent 43753826

mm/vmscan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message