mm: move page mapped accounting to the node

[deliverable/linux.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 73b018df6e4226a4d34ad882cf434e12fccffe8b..c11935bf37cb250f0ffa37dd958352985b5e8781 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4312,7 +4312,7 @@ void show_free_areas(unsigned int filter)
                global_page_state(NR_UNSTABLE_NFS),
                global_page_state(NR_SLAB_RECLAIMABLE),
                global_page_state(NR_SLAB_UNRECLAIMABLE),
-               global_page_state(NR_FILE_MAPPED),
+               global_node_page_state(NR_FILE_MAPPED),
                global_page_state(NR_SHMEM),
                global_page_state(NR_PAGETABLE),
                global_page_state(NR_BOUNCE),
@@ -4334,6 +4334,7 @@ void show_free_areas(unsigned int filter)
                        " unevictable:%lukB"
                        " isolated(anon):%lukB"
                        " isolated(file):%lukB"
+                       " mapped:%lukB"
                        " all_unreclaimable? %s"
                        "\n",
                        pgdat->node_id,
@@ -4344,6 +4345,7 @@ void show_free_areas(unsigned int filter)
                        K(node_page_state(pgdat, NR_UNEVICTABLE)),
                        K(node_page_state(pgdat, NR_ISOLATED_ANON)),
                        K(node_page_state(pgdat, NR_ISOLATED_FILE)),
+                       K(node_page_state(pgdat, NR_FILE_MAPPED)),
                        !pgdat_reclaimable(pgdat) ? "yes" : "no");
        }
 
@@ -4368,7 +4370,6 @@ void show_free_areas(unsigned int filter)
                        " mlocked:%lukB"
                        " dirty:%lukB"
                        " writeback:%lukB"
-                       " mapped:%lukB"
                        " shmem:%lukB"
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
                        " shmem_thp: %lukB"
@@ -4397,7 +4398,6 @@ void show_free_areas(unsigned int filter)
                        K(zone_page_state(zone, NR_MLOCK)),
                        K(zone_page_state(zone, NR_FILE_DIRTY)),
                        K(zone_page_state(zone, NR_WRITEBACK)),
-                       K(zone_page_state(zone, NR_FILE_MAPPED)),
                        K(zone_page_state(zone, NR_SHMEM)),
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
                        K(zone_page_state(zone, NR_SHMEM_THPS) * HPAGE_PMD_NR),