1 files changed, 27 insertions, 6 deletions

diff --git a/mm/vmstat.c b/mm/vmstat.c
index d7826af2fb07..9343227c5c60 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -619,8 +619,14 @@ const struct seq_operations pagetypeinfo_op = {
 static const char * const vmstat_text[] = {
         /* Zoned VM counters */
         "nr_free_pages",
-        "nr_inactive",
-        "nr_active",
+        "nr_inactive_anon",
+        "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 +681,16 @@ 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",
+        "unevictable_pgs_mlocked",
+        "unevictable_pgs_munlocked",
+        "unevictable_pgs_cleared",
+        "unevictable_pgs_stranded",
+        "unevictable_pgs_mlockfreed",
+#endif
 #endif
 };
 
@@ -688,7 +704,7 @@ 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 (a: %lu i: %lu)"
+                   "\n        scanned  %lu (aa: %lu ia: %lu af: %lu if: %lu)"
                    "\n        spanned  %lu"
                    "\n        present  %lu",
                    zone_page_state(zone, NR_FREE_PAGES),
@@ -696,7 +712,10 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
                    zone->pages_low,
                    zone->pages_high,
                    zone->pages_scanned,
-                   zone->nr_scan_active, zone->nr_scan_inactive,
+                   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);
 
@@ -733,10 +752,12 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
         seq_printf(m,
                    "\n  all_unreclaimable: %u"
                    "\n  prev_priority:     %i"
-                   "\n  start_pfn:         %lu",
+                   "\n  start_pfn:         %lu"
+                   "\n  inactive_ratio:    %u",
                            zone_is_all_unreclaimable(zone),
                    zone->prev_priority,
-                   zone->zone_start_pfn);
+                   zone->zone_start_pfn,
+                   zone->inactive_ratio);
         seq_putc(m, '\n');
 }