From: Hugh Dickins <hughd@google.com>
Date: Fri, 23 Mar 2012 09:57:31 +0000 (-0700)
Subject: mm: fix testorder interaction between two kswapd patches
X-Git-Tag: v3.4-rc1~124
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=643ac9fc5429e85b8b7f534544b80bcc4f34c367;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed