Merge branch 'pm-cpufreq'

[linux-2.6-microblaze.git] / mm / workingset.c

diff --git a/mm/workingset.c b/mm/workingset.c
index 130348c..10e96de 100644 (file)
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -381,9 +381,7 @@ void workingset_refault(struct page *page, void *shadow)
        if (workingset) {
                SetPageWorkingset(page);
                /* XXX: Move to lru_cache_add() when it supports new vs putback */
-               spin_lock_irq(&page_pgdat(page)->lru_lock);
                lru_note_cost_page(page);
-               spin_unlock_irq(&page_pgdat(page)->lru_lock);
                inc_lruvec_state(lruvec, WORKINGSET_RESTORE_BASE + file);
        }
 out:
@@ -445,12 +443,12 @@ void workingset_update_node(struct xa_node *node)
        if (node->count && node->count == node->nr_values) {
                if (list_empty(&node->private_list)) {
                        list_lru_add(&shadow_nodes, &node->private_list);
-                       __inc_lruvec_slab_state(node, WORKINGSET_NODES);
+                       __inc_lruvec_kmem_state(node, WORKINGSET_NODES);
                }
        } else {
                if (!list_empty(&node->private_list)) {
                        list_lru_del(&shadow_nodes, &node->private_list);
-                       __dec_lruvec_slab_state(node, WORKINGSET_NODES);
+                       __dec_lruvec_kmem_state(node, WORKINGSET_NODES);
                }
        }
 }
@@ -544,7 +542,7 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
        }
 
        list_lru_isolate(lru, item);
-       __dec_lruvec_slab_state(node, WORKINGSET_NODES);
+       __dec_lruvec_kmem_state(node, WORKINGSET_NODES);
 
        spin_unlock(lru_lock);
 
@@ -559,7 +557,7 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
                goto out_invalid;
        mapping->nrexceptional -= node->nr_values;
        xa_delete_node(node, workingset_update_node);
-       __inc_lruvec_slab_state(node, WORKINGSET_NODERECLAIM);
+       __inc_lruvec_kmem_state(node, WORKINGSET_NODERECLAIM);
 
 out_invalid:
        xa_unlock_irq(&mapping->i_pages);