Merge tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[mirror_ubuntu-artful-kernel.git] / mm / compaction.c

diff --git a/mm/compaction.c b/mm/compaction.c
index 81e1eaa2a2cf1bea89767185e9cb9549f2139ca2..09c5282ebdd2812fbb758255194d9063cf5dcf97 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -992,9 +992,6 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn,
 static bool suitable_migration_target(struct compact_control *cc,
                                                        struct page *page)
 {
-       if (cc->ignore_block_suitable)
-               return true;
-
        /* If the page is a large free page, then disallow migration */
        if (PageBuddy(page)) {
                /*
@@ -1006,6 +1003,9 @@ static bool suitable_migration_target(struct compact_control *cc,
                        return false;
        }
 
+       if (cc->ignore_block_suitable)
+               return true;
+
        /* If the block is MIGRATE_MOVABLE or MIGRATE_CMA, allow migration */
        if (migrate_async_suitable(get_pageblock_migratetype(page)))
                return true;