4 files changed, 9 insertions, 22 deletions

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 7616a77ca322..bc9f43bf7e29 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -125,13 +125,7 @@ static ssize_t node_read_meminfo(struct device *dev,
                        nid, K(node_page_state(nid, NR_WRITEBACK)),
                        nid, K(node_page_state(nid, NR_FILE_PAGES)),
                        nid, K(node_page_state(nid, NR_FILE_MAPPED)),
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-                       nid, K(node_page_state(nid, NR_ANON_PAGES)
-                        + node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
-                        HPAGE_PMD_NR),
-#else
                        nid, K(node_page_state(nid, NR_ANON_PAGES)),
-#endif
                        nid, K(node_page_state(nid, NR_SHMEM)),
                        nid, node_page_state(nid, NR_KERNEL_STACK) *
                                 THREAD_SIZE / 1024,
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index 5aa847a603c0..59d85d608898 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -132,13 +132,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
                 K(i.freeswap),
                 K(global_page_state(NR_FILE_DIRTY)),
                 K(global_page_state(NR_WRITEBACK)),
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-                K(global_page_state(NR_ANON_PAGES)
-                  + global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-                  HPAGE_PMD_NR),
-#else
                 K(global_page_state(NR_ANON_PAGES)),
-#endif
                 K(global_page_state(NR_FILE_MAPPED)),
                 K(global_page_state(NR_SHMEM)),
                 K(global_page_state(NR_SLAB_RECLAIMABLE) +
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 963e14c0486f..7cef0c098630 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1661,7 +1661,6 @@ static void __split_huge_page_refcount(struct page *page,
         BUG_ON(atomic_read(&page->_count) <= 0);
 
         __mod_zone_page_state(zone, NR_ANON_TRANSPARENT_HUGEPAGES, -1);
-        __mod_zone_page_state(zone, NR_ANON_PAGES, HPAGE_PMD_NR);
 
         ClearPageCompound(page);
         compound_unlock(page);
diff --git a/mm/rmap.c b/mm/rmap.c
index a21c976a8ec1..fd3ee7a54a13 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1052,11 +1052,11 @@ void do_page_add_anon_rmap(struct page *page,
 {
         int first = atomic_inc_and_test(&page->_mapcount);
         if (first) {
-                if (!PageTransHuge(page))
-                        __inc_zone_page_state(page, NR_ANON_PAGES);
-                else
+                if (PageTransHuge(page))
                         __inc_zone_page_state(page,
                                               NR_ANON_TRANSPARENT_HUGEPAGES);
+                __mod_zone_page_state(page_zone(page), NR_ANON_PAGES,
+                                hpage_nr_pages(page));
         }
         if (unlikely(PageKsm(page)))
                 return;
@@ -1085,10 +1085,10 @@ void page_add_new_anon_rmap(struct page *page,
         VM_BUG_ON(address < vma->vm_start || address >= vma->vm_end);
         SetPageSwapBacked(page);
         atomic_set(&page->_mapcount, 0); /* increment count (starts at -1) */
-        if (!PageTransHuge(page))
-                __inc_zone_page_state(page, NR_ANON_PAGES);
-        else
+        if (PageTransHuge(page))
                 __inc_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES);
+        __mod_zone_page_state(page_zone(page), NR_ANON_PAGES,
+                        hpage_nr_pages(page));
         __page_set_anon_rmap(page, vma, address, 1);
         if (!mlocked_vma_newpage(vma, page)) {
                 SetPageActive(page);
@@ -1148,11 +1148,11 @@ void page_remove_rmap(struct page *page)
                 goto out;
         if (anon) {
                 mem_cgroup_uncharge_page(page);
-                if (!PageTransHuge(page))
-                        __dec_zone_page_state(page, NR_ANON_PAGES);
-                else
+                if (PageTransHuge(page))
                         __dec_zone_page_state(page,
                                               NR_ANON_TRANSPARENT_HUGEPAGES);
+                __mod_zone_page_state(page_zone(page), NR_ANON_PAGES,
+                                -hpage_nr_pages(page));
         } else {
                 __dec_zone_page_state(page, NR_FILE_MAPPED);
                 mem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED);