diff options
Diffstat (limited to 'include/linux/memcontrol.h')
| -rw-r--r-- | include/linux/memcontrol.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 9815951ec995..925d57b236aa 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
| @@ -51,10 +51,8 @@ extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm, | |||
| 51 | gfp_t gfp_mask); | 51 | gfp_t gfp_mask); |
| 52 | int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *mem); | 52 | int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *mem); |
| 53 | 53 | ||
| 54 | static inline struct mem_cgroup *mm_cgroup(const struct mm_struct *mm) | 54 | #define vm_match_cgroup(mm, cgroup) \ |
| 55 | { | 55 | ((cgroup) == rcu_dereference((mm)->mem_cgroup)) |
| 56 | return rcu_dereference(mm->mem_cgroup); | ||
| 57 | } | ||
| 58 | 56 | ||
| 59 | extern int mem_cgroup_prepare_migration(struct page *page); | 57 | extern int mem_cgroup_prepare_migration(struct page *page); |
| 60 | extern void mem_cgroup_end_migration(struct page *page); | 58 | extern void mem_cgroup_end_migration(struct page *page); |
| @@ -123,9 +121,9 @@ static inline int mem_cgroup_cache_charge(struct page *page, | |||
| 123 | return 0; | 121 | return 0; |
| 124 | } | 122 | } |
| 125 | 123 | ||
| 126 | static inline struct mem_cgroup *mm_cgroup(const struct mm_struct *mm) | 124 | static inline int vm_match_cgroup(struct mm_struct *mm, struct mem_cgroup *mem) |
| 127 | { | 125 | { |
| 128 | return NULL; | 126 | return 1; |
| 129 | } | 127 | } |
| 130 | 128 | ||
| 131 | static inline int task_in_mem_cgroup(struct task_struct *task, | 129 | static inline int task_in_mem_cgroup(struct task_struct *task, |
