aboutsummaryrefslogtreecommitdiffstats
path: root/mm/workingset.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/workingset.c')
-rw-r--r--mm/workingset.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/workingset.c b/mm/workingset.c
index 7820a7e1ca98..df0dacaf54ee 100644
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -218,7 +218,7 @@ void *workingset_eviction(struct address_space *mapping, struct page *page)
218 VM_BUG_ON_PAGE(page_count(page), page); 218 VM_BUG_ON_PAGE(page_count(page), page);
219 VM_BUG_ON_PAGE(!PageLocked(page), page); 219 VM_BUG_ON_PAGE(!PageLocked(page), page);
220 220
221 lruvec = mem_cgroup_zone_lruvec(zone, memcg); 221 lruvec = mem_cgroup_lruvec(zone->zone_pgdat, zone, memcg);
222 eviction = atomic_long_inc_return(&lruvec->inactive_age); 222 eviction = atomic_long_inc_return(&lruvec->inactive_age);
223 return pack_shadow(memcgid, zone, eviction); 223 return pack_shadow(memcgid, zone, eviction);
224} 224}
@@ -267,7 +267,7 @@ bool workingset_refault(void *shadow)
267 rcu_read_unlock(); 267 rcu_read_unlock();
268 return false; 268 return false;
269 } 269 }
270 lruvec = mem_cgroup_zone_lruvec(zone, memcg); 270 lruvec = mem_cgroup_lruvec(zone->zone_pgdat, zone, memcg);
271 refault = atomic_long_read(&lruvec->inactive_age); 271 refault = atomic_long_read(&lruvec->inactive_age);
272 active_file = lruvec_lru_size(lruvec, LRU_ACTIVE_FILE); 272 active_file = lruvec_lru_size(lruvec, LRU_ACTIVE_FILE);
273 rcu_read_unlock(); 273 rcu_read_unlock();
@@ -319,7 +319,7 @@ void workingset_activation(struct page *page)
319 memcg = page_memcg_rcu(page); 319 memcg = page_memcg_rcu(page);
320 if (!mem_cgroup_disabled() && !memcg) 320 if (!mem_cgroup_disabled() && !memcg)
321 goto out; 321 goto out;
322 lruvec = mem_cgroup_zone_lruvec(page_zone(page), memcg); 322 lruvec = mem_cgroup_lruvec(page_pgdat(page), page_zone(page), memcg);
323 atomic_long_inc(&lruvec->inactive_age); 323 atomic_long_inc(&lruvec->inactive_age);
324out: 324out:
325 rcu_read_unlock(); 325 rcu_read_unlock();