aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/memcontrol.h
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2009-01-07 21:08:20 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-08 11:31:08 -0500
commit3e2f41f1f64744f7942980d93cc93dd3e5924560 (patch)
tree7b605c407b7470877fd9c5c853407f75edcbeb49 /include/linux/memcontrol.h
parenta3d8e0549d913e30968fa02e505dfe02c0a23e0d (diff)
memcg: add zone_reclaim_stat
Introduce mem_cgroup_per_zone::reclaim_stat member and its statics collecting function. Now, get_scan_ratio() can calculate correct value on memcg reclaim. [hugh@veritas.com: avoid reclaim_stat oops when disabled] Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Rik van Riel <riel@redhat.com> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Cc: Hugh Dickins <hugh@veritas.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/memcontrol.h')
-rw-r--r--include/linux/memcontrol.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index b1defd6a2783..36b8ebb39b82 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -105,6 +105,10 @@ int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg,
105unsigned long mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg, 105unsigned long mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg,
106 struct zone *zone, 106 struct zone *zone,
107 enum lru_list lru); 107 enum lru_list lru);
108struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg,
109 struct zone *zone);
110struct zone_reclaim_stat*
111mem_cgroup_get_reclaim_stat_from_page(struct page *page);
108 112
109#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP 113#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
110extern int do_swap_account; 114extern int do_swap_account;
@@ -271,6 +275,18 @@ mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg, struct zone *zone,
271} 275}
272 276
273 277
278static inline struct zone_reclaim_stat*
279mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg, struct zone *zone)
280{
281 return NULL;
282}
283
284static inline struct zone_reclaim_stat*
285mem_cgroup_get_reclaim_stat_from_page(struct page *page)
286{
287 return NULL;
288}
289
274#endif /* CONFIG_CGROUP_MEM_CONT */ 290#endif /* CONFIG_CGROUP_MEM_CONT */
275 291
276#endif /* _LINUX_MEMCONTROL_H */ 292#endif /* _LINUX_MEMCONTROL_H */