Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / mm / compaction.c

diff --git a/mm/compaction.c b/mm/compaction.c
index 7c607479de4a8b9c871f5b5dafbbc10784a7c6d4..ef29490b0f462349ec90b8672448f80627ef3af6 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1431,7 +1431,7 @@ static enum compact_result __compaction_suitable(struct zone *zone, int order,
        if (is_via_compact_memory(order))
                return COMPACT_CONTINUE;
 
-       watermark = zone->watermark[alloc_flags & ALLOC_WMARK_MASK];
+       watermark = wmark_pages(zone, alloc_flags & ALLOC_WMARK_MASK);
        /*
         * If watermarks for high-order allocation are already met, there
         * should be no need for compaction at all.