1 files changed, 7 insertions, 12 deletions

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 74d66dba0cbe..138bed53706e 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -629,10 +629,8 @@ static const char * const vmstat_text[] = {
         "nr_active_anon",
         "nr_inactive_file",
         "nr_active_file",
-#ifdef CONFIG_UNEVICTABLE_LRU
         "nr_unevictable",
         "nr_mlock",
-#endif
         "nr_anon_pages",
         "nr_mapped",
         "nr_file_pages",
@@ -675,6 +673,9 @@ static const char * const vmstat_text[] = {
         TEXTS_FOR_ZONES("pgscan_kswapd")
         TEXTS_FOR_ZONES("pgscan_direct")
 
+#ifdef CONFIG_NUMA
+        "zone_reclaim_failed",
+#endif
         "pginodesteal",
         "slabs_scanned",
         "kswapd_steal",
@@ -687,7 +688,6 @@ static const char * const vmstat_text[] = {
         "htlb_buddy_alloc_success",
         "htlb_buddy_alloc_fail",
 #endif
-#ifdef CONFIG_UNEVICTABLE_LRU
         "unevictable_pgs_culled",
         "unevictable_pgs_scanned",
         "unevictable_pgs_rescued",
@@ -697,7 +697,6 @@ static const char * const vmstat_text[] = {
         "unevictable_pgs_stranded",
         "unevictable_pgs_mlockfreed",
 #endif
-#endif
 };
 
 static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
@@ -710,18 +709,14 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
                    "\n        min      %lu"
                    "\n        low      %lu"
                    "\n        high     %lu"
-                   "\n        scanned  %lu (aa: %lu ia: %lu af: %lu if: %lu)"
+                   "\n        scanned  %lu"
                    "\n        spanned  %lu"
                    "\n        present  %lu",
                    zone_page_state(zone, NR_FREE_PAGES),
-                   zone->pages_min,
-                   zone->pages_low,
-                   zone->pages_high,
+                   min_wmark_pages(zone),
+                   low_wmark_pages(zone),
+                   high_wmark_pages(zone),
                    zone->pages_scanned,
-                   zone->lru[LRU_ACTIVE_ANON].nr_scan,
-                   zone->lru[LRU_INACTIVE_ANON].nr_scan,
-                   zone->lru[LRU_ACTIVE_FILE].nr_scan,
-                   zone->lru[LRU_INACTIVE_FILE].nr_scan,
                    zone->spanned_pages,
                    zone->present_pages);