4 files changed, 8 insertions, 4 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 60c7244c42e4..0faacfe18909 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -111,7 +111,8 @@ static void get_writeback_state(struct writeback_state *wbs)
 {
         wbs->nr_dirty = read_page_state(nr_dirty);
         wbs->nr_unstable = read_page_state(nr_unstable);
-        wbs->nr_mapped = global_page_state(NR_FILE_MAPPED);
+        wbs->nr_mapped = global_page_state(NR_FILE_MAPPED) +
+                                global_page_state(NR_ANON_PAGES);
         wbs->nr_writeback = read_page_state(nr_writeback);
 }
 
diff --git a/mm/rmap.c b/mm/rmap.c
index af5e9808e65d..40158b59729e 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -455,7 +455,7 @@ static void __page_set_anon_rmap(struct page *page,
          * nr_mapped state can be updated without turning off
          * interrupts because it is not modified via interrupt.
          */
-        __inc_zone_page_state(page, NR_FILE_MAPPED);
+        __inc_zone_page_state(page, NR_ANON_PAGES);
 }
 
 /**
@@ -531,7 +531,8 @@ void page_remove_rmap(struct page *page)
                  */
                 if (page_test_and_clear_dirty(page))
                         set_page_dirty(page);
-                __dec_zone_page_state(page, NR_FILE_MAPPED);
+                __dec_zone_page_state(page,
+                                PageAnon(page) ? NR_ANON_PAGES : NR_FILE_MAPPED);
         }
 }
 
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 08bc54e80862..2f0390161c0e 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -742,7 +742,8 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
                  * how much memory
                  * is mapped.
                  */
-                mapped_ratio = (global_page_state(NR_FILE_MAPPED) * 100) /
+                mapped_ratio = ((global_page_state(NR_FILE_MAPPED) +
+                                global_page_state(NR_ANON_PAGES)) * 100) /
                                         vm_total_pages;
 
                 /*
diff --git a/mm/vmstat.c b/mm/vmstat.c
index f16b33eb6d5c..3baf4dffa62a 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -395,6 +395,7 @@ struct seq_operations fragmentation_op = {
 
 static char *vmstat_text[] = {
         /* Zoned VM counters */
+        "nr_anon_pages",
         "nr_mapped",
         "nr_file_pages",