aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index a68db296ada6..9d1764630dff 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1208,19 +1208,15 @@ int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *memcg)
1208 return ret; 1208 return ret;
1209} 1209}
1210 1210
1211int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg, struct zone *zone) 1211int mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec)
1212{ 1212{
1213 unsigned long inactive_ratio; 1213 unsigned long inactive_ratio;
1214 int nid = zone_to_nid(zone);
1215 int zid = zone_idx(zone);
1216 unsigned long inactive; 1214 unsigned long inactive;
1217 unsigned long active; 1215 unsigned long active;
1218 unsigned long gb; 1216 unsigned long gb;
1219 1217
1220 inactive = mem_cgroup_zone_nr_lru_pages(memcg, nid, zid, 1218 inactive = mem_cgroup_get_lruvec_size(lruvec, LRU_INACTIVE_ANON);
1221 BIT(LRU_INACTIVE_ANON)); 1219 active = mem_cgroup_get_lruvec_size(lruvec, LRU_ACTIVE_ANON);
1222 active = mem_cgroup_zone_nr_lru_pages(memcg, nid, zid,
1223 BIT(LRU_ACTIVE_ANON));
1224 1220
1225 gb = (inactive + active) >> (30 - PAGE_SHIFT); 1221 gb = (inactive + active) >> (30 - PAGE_SHIFT);
1226 if (gb) 1222 if (gb)
@@ -1231,17 +1227,13 @@ int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg, struct zone *zone)
1231 return inactive * inactive_ratio < active; 1227 return inactive * inactive_ratio < active;
1232} 1228}
1233 1229
1234int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg, struct zone *zone) 1230int mem_cgroup_inactive_file_is_low(struct lruvec *lruvec)
1235{ 1231{
1236 unsigned long active; 1232 unsigned long active;
1237 unsigned long inactive; 1233 unsigned long inactive;
1238 int zid = zone_idx(zone);
1239 int nid = zone_to_nid(zone);
1240 1234
1241 inactive = mem_cgroup_zone_nr_lru_pages(memcg, nid, zid, 1235 inactive = mem_cgroup_get_lruvec_size(lruvec, LRU_INACTIVE_FILE);
1242 BIT(LRU_INACTIVE_FILE)); 1236 active = mem_cgroup_get_lruvec_size(lruvec, LRU_ACTIVE_FILE);
1243 active = mem_cgroup_zone_nr_lru_pages(memcg, nid, zid,
1244 BIT(LRU_ACTIVE_FILE));
1245 1237
1246 return (active > inactive); 1238 return (active > inactive);
1247} 1239}