mm, vmstat: add infrastructure for per-node vmstats

[mirror_ubuntu-artful-kernel.git] / mm / workingset.c

diff --git a/mm/workingset.c b/mm/workingset.c
index d7cc4bbd7e1bd4278e946e5845360499a9b24de4..5ffba0c0adc63e05289ac85a3a7dfa67850b0ddc 100644 (file)
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -351,12 +351,13 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker,
        shadow_nodes = list_lru_shrink_count(&workingset_shadow_nodes, sc);
        local_irq_enable();
 
-       if (memcg_kmem_enabled())
+       if (memcg_kmem_enabled()) {
                pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
                                                     LRU_ALL_FILE);
-       else
-               pages = node_page_state(sc->nid, NR_ACTIVE_FILE) +
-                       node_page_state(sc->nid, NR_INACTIVE_FILE);
+       } else {
+               pages = sum_zone_node_page_state(sc->nid, NR_ACTIVE_FILE) +
+                       sum_zone_node_page_state(sc->nid, NR_INACTIVE_FILE);
+       }
 
        /*
         * Active cache pages are limited to 50% of memory, and shadow