2 files changed, 13 insertions, 2 deletions

diff --git a/mm/vmstat.c b/mm/vmstat.c
index d918f6192d15..dab53430f63c 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1143,6 +1143,7 @@ const char * const vmstat_text[] = {
         "nr_slab_unreclaimable",
         "nr_isolated_anon",
         "nr_isolated_file",
+        "workingset_nodes",
         "workingset_refault",
         "workingset_activate",
         "workingset_restore",
diff --git a/mm/workingset.c b/mm/workingset.c
index 5a72c9d5e195..7e6ef312cea5 100644
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -377,12 +377,20 @@ void workingset_update_node(struct radix_tree_node *node)
          * already where they should be. The list_empty() test is safe
          * as node->private_list is protected by the i_pages lock.
          */
+        VM_WARN_ON_ONCE(!irqs_disabled());  /* For __inc_lruvec_page_state */
+
         if (node->count && node->count == node->exceptional) {
-                if (list_empty(&node->private_list))
+                if (list_empty(&node->private_list)) {
                         list_lru_add(&shadow_nodes, &node->private_list);
+                        __inc_lruvec_page_state(virt_to_page(node),
+                                                WORKINGSET_NODES);
+                }
         } else {
-                if (!list_empty(&node->private_list))
+                if (!list_empty(&node->private_list)) {
                         list_lru_del(&shadow_nodes, &node->private_list);
+                        __dec_lruvec_page_state(virt_to_page(node),
+                                                WORKINGSET_NODES);
+                }
         }
 }
 
@@ -473,6 +481,8 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
         }
 
         list_lru_isolate(lru, item);
+        __dec_lruvec_page_state(virt_to_page(node), WORKINGSET_NODES);
+
         spin_unlock(lru_lock);
 
         /*