Merge tag 'mvebu-fixes-4.13-3' of git://git.infradead.org/linux-mvebu into fixes

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

diff --git a/mm/workingset.c b/mm/workingset.c
index b8c9ab6784795a0e7f8eff82a9a071d481e91a5f..7119cd745ace859935bc97b9079b6e43ad417d54 100644 (file)
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -288,12 +288,10 @@ bool workingset_refault(void *shadow)
         */
        refault_distance = (refault - eviction) & EVICTION_MASK;
 
-       inc_node_state(pgdat, WORKINGSET_REFAULT);
-       inc_memcg_state(memcg, WORKINGSET_REFAULT);
+       inc_lruvec_state(lruvec, WORKINGSET_REFAULT);
 
        if (refault_distance <= active_file) {
-               inc_node_state(pgdat, WORKINGSET_ACTIVATE);
-               inc_memcg_state(memcg, WORKINGSET_ACTIVATE);
+               inc_lruvec_state(lruvec, WORKINGSET_ACTIVATE);
                rcu_read_unlock();
                return true;
        }
@@ -474,8 +472,7 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
        }
        if (WARN_ON_ONCE(node->exceptional))
                goto out_invalid;
-       inc_node_state(page_pgdat(virt_to_page(node)), WORKINGSET_NODERECLAIM);
-       inc_memcg_page_state(virt_to_page(node), WORKINGSET_NODERECLAIM);
+       inc_lruvec_page_state(virt_to_page(node), WORKINGSET_NODERECLAIM);
        __radix_tree_delete_node(&mapping->page_tree, node,
                                 workingset_update_node, mapping);