aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/memcontrol.h11
-rw-r--r--mm/memcontrol.c5
2 files changed, 9 insertions, 7 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index cc0ad7191acd..4f580268b1b7 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -20,6 +20,9 @@
20#ifndef _LINUX_MEMCONTROL_H 20#ifndef _LINUX_MEMCONTROL_H
21#define _LINUX_MEMCONTROL_H 21#define _LINUX_MEMCONTROL_H
22 22
23#include <linux/rcupdate.h>
24#include <linux/mm.h>
25
23struct mem_cgroup; 26struct mem_cgroup;
24struct page_cgroup; 27struct page_cgroup;
25struct page; 28struct page;
@@ -45,7 +48,11 @@ extern unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
45extern void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask); 48extern void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask);
46extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm, 49extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
47 gfp_t gfp_mask); 50 gfp_t gfp_mask);
48extern struct mem_cgroup *mm_cgroup(struct mm_struct *mm); 51
52static inline struct mem_cgroup *mm_cgroup(const struct mm_struct *mm)
53{
54 return rcu_dereference(mm->mem_cgroup);
55}
49 56
50static inline void mem_cgroup_uncharge_page(struct page *page) 57static inline void mem_cgroup_uncharge_page(struct page *page)
51{ 58{
@@ -98,7 +105,7 @@ static inline int mem_cgroup_cache_charge(struct page *page,
98 return 0; 105 return 0;
99} 106}
100 107
101static inline struct mem_cgroup *mm_cgroup(struct mm_struct *mm) 108static inline struct mem_cgroup *mm_cgroup(const struct mm_struct *mm)
102{ 109{
103 return NULL; 110 return NULL;
104} 111}
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index ac8774426fec..f6cdbf755ed3 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -110,11 +110,6 @@ struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p)
110 struct mem_cgroup, css); 110 struct mem_cgroup, css);
111} 111}
112 112
113inline struct mem_cgroup *mm_cgroup(struct mm_struct *mm)
114{
115 return rcu_dereference(mm->mem_cgroup);
116}
117
118void mm_init_cgroup(struct mm_struct *mm, struct task_struct *p) 113void mm_init_cgroup(struct mm_struct *mm, struct task_struct *p)
119{ 114{
120 struct mem_cgroup *mem; 115 struct mem_cgroup *mem;