1 files changed, 18 insertions, 17 deletions

diff --git a/mm/compaction.c b/mm/compaction.c
index c62bd063d766..05ccb4cc0bdb 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -15,6 +15,7 @@
 #include <linux/sysctl.h>
 #include <linux/sysfs.h>
 #include <linux/balloon_compaction.h>
+#include <linux/page-isolation.h>
 #include "internal.h"
 
 #ifdef CONFIG_COMPACTION
@@ -85,7 +86,7 @@ static inline bool isolation_suitable(struct compact_control *cc,
 static void __reset_isolation_suitable(struct zone *zone)
 {
         unsigned long start_pfn = zone->zone_start_pfn;
-        unsigned long end_pfn = zone->zone_start_pfn + zone->spanned_pages;
+        unsigned long end_pfn = zone_end_pfn(zone);
         unsigned long pfn;
 
         zone->compact_cached_migrate_pfn = start_pfn;
@@ -215,7 +216,10 @@ static bool suitable_migration_target(struct page *page)
         int migratetype = get_pageblock_migratetype(page);
 
         /* Don't interfere with memory hot-remove or the min_free_kbytes blocks */
-        if (migratetype == MIGRATE_ISOLATE || migratetype == MIGRATE_RESERVE)
+        if (migratetype == MIGRATE_RESERVE)
+                return false;
+
+        if (is_migrate_isolate(migratetype))
                 return false;
 
         /* If the page is a large free page, then allow migration */
@@ -611,8 +615,7 @@ check_compact_cluster:
                 continue;
 
 next_pageblock:
-                low_pfn += pageblock_nr_pages;
-                low_pfn = ALIGN(low_pfn, pageblock_nr_pages) - 1;
+                low_pfn = ALIGN(low_pfn + 1, pageblock_nr_pages) - 1;
                 last_pageblock_nr = pageblock_nr;
         }
 
@@ -644,7 +647,7 @@ static void isolate_freepages(struct zone *zone,
                                 struct compact_control *cc)
 {
         struct page *page;
-        unsigned long high_pfn, low_pfn, pfn, zone_end_pfn, end_pfn;
+        unsigned long high_pfn, low_pfn, pfn, z_end_pfn, end_pfn;
         int nr_freepages = cc->nr_freepages;
         struct list_head *freelist = &cc->freepages;
 
@@ -663,7 +666,7 @@ static void isolate_freepages(struct zone *zone,
          */
         high_pfn = min(low_pfn, pfn);
 
-        zone_end_pfn = zone->zone_start_pfn + zone->spanned_pages;
+        z_end_pfn = zone_end_pfn(zone);
 
         /*
          * Isolate free pages until enough are available to migrate the
@@ -706,7 +709,7 @@ static void isolate_freepages(struct zone *zone,
                  * only scans within a pageblock
                  */
                 end_pfn = ALIGN(pfn + 1, pageblock_nr_pages);
-                end_pfn = min(end_pfn, zone_end_pfn);
+                end_pfn = min(end_pfn, z_end_pfn);
                 isolated = isolate_freepages_block(cc, pfn, end_pfn,
                                                    freelist, false);
                 nr_freepages += isolated;
@@ -795,7 +798,7 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
         low_pfn = max(cc->migrate_pfn, zone->zone_start_pfn);
 
         /* Only scan within a pageblock boundary */
-        end_pfn = ALIGN(low_pfn + pageblock_nr_pages, pageblock_nr_pages);
+        end_pfn = ALIGN(low_pfn + 1, pageblock_nr_pages);
 
         /* Do not cross the free scanner or scan within a memory hole */
         if (end_pfn > cc->free_pfn || !pfn_valid(low_pfn)) {
@@ -920,7 +923,7 @@ static int compact_zone(struct zone *zone, struct compact_control *cc)
 {
         int ret;
         unsigned long start_pfn = zone->zone_start_pfn;
-        unsigned long end_pfn = zone->zone_start_pfn + zone->spanned_pages;
+        unsigned long end_pfn = zone_end_pfn(zone);
 
         ret = compaction_suitable(zone, cc->order);
         switch (ret) {
@@ -977,7 +980,7 @@ static int compact_zone(struct zone *zone, struct compact_control *cc)
 
                 nr_migrate = cc->nr_migratepages;
                 err = migrate_pages(&cc->migratepages, compaction_alloc,
-                                (unsigned long)cc, false,
+                                (unsigned long)cc,
                                 cc->sync ? MIGRATE_SYNC_LIGHT : MIGRATE_ASYNC,
                                 MR_COMPACTION);
                 update_nr_listpages(cc);
@@ -1086,7 +1089,7 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist,
 
 
 /* Compact all zones within a node */
-static int __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)
+static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)
 {
         int zoneid;
         struct zone *zone;
@@ -1119,28 +1122,26 @@ static int __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)
                 VM_BUG_ON(!list_empty(&cc->freepages));
                 VM_BUG_ON(!list_empty(&cc->migratepages));
         }
-
-        return 0;
 }
 
-int compact_pgdat(pg_data_t *pgdat, int order)
+void compact_pgdat(pg_data_t *pgdat, int order)
 {
         struct compact_control cc = {
                 .order = order,
                 .sync = false,
         };
 
-        return __compact_pgdat(pgdat, &cc);
+        __compact_pgdat(pgdat, &cc);
 }
 
-static int compact_node(int nid)
+static void compact_node(int nid)
 {
         struct compact_control cc = {
                 .order = -1,
                 .sync = true,
         };
 
-        return __compact_pgdat(NODE_DATA(nid), &cc);
+        __compact_pgdat(NODE_DATA(nid), &cc);
 }
 
 /* Compact all nodes in the system */