1 files changed, 4 insertions, 3 deletions

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 9800306c8195..e1d8ed172c42 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -142,7 +142,7 @@ int calculate_normal_threshold(struct zone *zone)
          * 125          1024            10      16-32 GB        9
          */
 
-        mem = zone->present_pages >> (27 - PAGE_SHIFT);
+        mem = zone->managed_pages >> (27 - PAGE_SHIFT);
 
         threshold = 2 * fls(num_online_cpus()) * (1 + fls(mem));
 
@@ -628,7 +628,9 @@ static char * const migratetype_names[MIGRATE_TYPES] = {
 #ifdef CONFIG_CMA
         "CMA",
 #endif
+#ifdef CONFIG_MEMORY_ISOLATION
         "Isolate",
+#endif
 };
 
 static void *frag_start(struct seq_file *m, loff_t *pos)
@@ -768,7 +770,6 @@ const char * const vmstat_text[] = {
         "kswapd_inodesteal",
         "kswapd_low_wmark_hit_quickly",
         "kswapd_high_wmark_hit_quickly",
-        "kswapd_skip_congestion_wait",
         "pageoutrun",
         "allocstall",
 
@@ -890,7 +891,7 @@ static void pagetypeinfo_showblockcount_print(struct seq_file *m,
         int mtype;
         unsigned long pfn;
         unsigned long start_pfn = zone->zone_start_pfn;
-        unsigned long end_pfn = start_pfn + zone->spanned_pages;
+        unsigned long end_pfn = zone_end_pfn(zone);
         unsigned long count[MIGRATE_TYPES] = { 0, };
 
         for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) {