mm, rmap: account shmem thp pages

[linux-beck.git] / drivers / base / node.c

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 560751bad2947105a0d06e7650bf906c3e4f0de7..51c7db2c4ee2a6bc06cc5ee2c22758fc91cb7c66 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -113,6 +113,8 @@ static ssize_t node_read_meminfo(struct device *dev,
                       "Node %d SUnreclaim:     %8lu kB\n"
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
                       "Node %d AnonHugePages:  %8lu kB\n"
+                      "Node %d ShmemHugePages: %8lu kB\n"
+                      "Node %d ShmemPmdMapped: %8lu kB\n"
 #endif
                        ,
                       nid, K(node_page_state(nid, NR_FILE_DIRTY)),
@@ -131,10 +133,13 @@ static ssize_t node_read_meminfo(struct device *dev,
                                node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
                       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-                      nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))
-                       , nid,
-                       K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
-                       HPAGE_PMD_NR));
+                      nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
+                      nid, K(node_page_state(nid, NR_ANON_THPS) *
+                                      HPAGE_PMD_NR),
+                      nid, K(node_page_state(nid, NR_SHMEM_THPS) *
+                                      HPAGE_PMD_NR),
+                      nid, K(node_page_state(nid, NR_SHMEM_PMDMAPPED) *
+                                      HPAGE_PMD_NR));
 #else
                       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));
 #endif