Merge branch 'akpm' (Andrew's patch-bomb)

[can-eth-gw-linux.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index c7370579111b872943c56bd694dc0bd02121092d..df14808f0a360ea38a30f3217d2fdd301de4d6b3 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -801,6 +801,8 @@ const char * const vmstat_text[] = {
        "thp_collapse_alloc",
        "thp_collapse_alloc_failed",
        "thp_split",
+       "thp_zero_page_alloc",
+       "thp_zero_page_alloc_failed",
 #endif
 
 #endif /* CONFIG_VM_EVENTS_COUNTERS */
@@ -930,7 +932,7 @@ static int pagetypeinfo_show(struct seq_file *m, void *arg)
        pg_data_t *pgdat = (pg_data_t *)arg;
 
        /* check memoryless node */
-       if (!node_state(pgdat->node_id, N_HIGH_MEMORY))
+       if (!node_state(pgdat->node_id, N_MEMORY))
                return 0;
 
        seq_printf(m, "Page block order: %d\n", pageblock_order);
@@ -992,14 +994,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],
@@ -1292,7 +1296,7 @@ static int unusable_show(struct seq_file *m, void *arg)
        pg_data_t *pgdat = (pg_data_t *)arg;
 
        /* check memoryless node */
-       if (!node_state(pgdat->node_id, N_HIGH_MEMORY))
+       if (!node_state(pgdat->node_id, N_MEMORY))
                return 0;
 
        walk_zones_in_node(m, pgdat, unusable_show_print);