aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/memcontrol.h7
-rw-r--r--mm/memcontrol.c5
2 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index fc9bae82ac42..2c30a1116d84 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -81,6 +81,8 @@ int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
81 return cgroup == mem; 81 return cgroup == mem;
82} 82}
83 83
84extern struct cgroup_subsys_state *mem_cgroup_css(struct mem_cgroup *mem);
85
84extern int 86extern int
85mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr); 87mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr);
86extern void mem_cgroup_end_migration(struct mem_cgroup *mem, 88extern void mem_cgroup_end_migration(struct mem_cgroup *mem,
@@ -206,6 +208,11 @@ static inline int task_in_mem_cgroup(struct task_struct *task,
206 return 1; 208 return 1;
207} 209}
208 210
211static inline struct cgroup_subsys_state *mem_cgroup_css(struct mem_cgroup *mem)
212{
213 return NULL;
214}
215
209static inline int 216static inline int
210mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr) 217mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr)
211{ 218{
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index b5ac61ce7346..9eee80d6d490 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -282,6 +282,11 @@ mem_cgroup_zoneinfo(struct mem_cgroup *mem, int nid, int zid)
282 return &mem->info.nodeinfo[nid]->zoneinfo[zid]; 282 return &mem->info.nodeinfo[nid]->zoneinfo[zid];
283} 283}
284 284
285struct cgroup_subsys_state *mem_cgroup_css(struct mem_cgroup *mem)
286{
287 return &mem->css;
288}
289
285static struct mem_cgroup_per_zone * 290static struct mem_cgroup_per_zone *
286page_cgroup_zoneinfo(struct page_cgroup *pc) 291page_cgroup_zoneinfo(struct page_cgroup *pc)
287{ 292{