Merge tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 9a4a522..9800306 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -774,10 +774,20 @@ const char * const vmstat_text[] = {
 
        "pgrotated",
 
+#ifdef CONFIG_NUMA_BALANCING
+       "numa_pte_updates",
+       "numa_hint_faults",
+       "numa_hint_faults_local",
+       "numa_pages_migrated",
+#endif
+#ifdef CONFIG_MIGRATION
+       "pgmigrate_success",
+       "pgmigrate_fail",
+#endif
 #ifdef CONFIG_COMPACTION
-       "compact_blocks_moved",
-       "compact_pages_moved",
-       "compact_pagemigrate_failed",
+       "compact_migrate_scanned",
+       "compact_free_scanned",
+       "compact_isolated",
        "compact_stall",
        "compact_fail",
        "compact_success",
@@ -994,14 +1004,16 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
                   "\n        high     %lu"
                   "\n        scanned  %lu"
                   "\n        spanned  %lu"
-                  "\n        present  %lu",
+                  "\n        present  %lu"
+                  "\n        managed  %lu",
                   zone_page_state(zone, NR_FREE_PAGES),
                   min_wmark_pages(zone),
                   low_wmark_pages(zone),
                   high_wmark_pages(zone),
                   zone->pages_scanned,
                   zone->spanned_pages,
-                  zone->present_pages);
+                  zone->present_pages,
+                  zone->managed_pages);
 
        for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
                seq_printf(m, "\n    %-12s %lu", vmstat_text[i],