diff options
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index d5fd3dcd3f2e..fc259926c170 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -4953,8 +4953,7 @@ static void mem_cgroup_clear_mc(void) | |||
4953 | 4953 | ||
4954 | static int mem_cgroup_can_attach(struct cgroup_subsys *ss, | 4954 | static int mem_cgroup_can_attach(struct cgroup_subsys *ss, |
4955 | struct cgroup *cgroup, | 4955 | struct cgroup *cgroup, |
4956 | struct task_struct *p, | 4956 | struct task_struct *p) |
4957 | bool threadgroup) | ||
4958 | { | 4957 | { |
4959 | int ret = 0; | 4958 | int ret = 0; |
4960 | struct mem_cgroup *mem = mem_cgroup_from_cont(cgroup); | 4959 | struct mem_cgroup *mem = mem_cgroup_from_cont(cgroup); |
@@ -4993,8 +4992,7 @@ static int mem_cgroup_can_attach(struct cgroup_subsys *ss, | |||
4993 | 4992 | ||
4994 | static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss, | 4993 | static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss, |
4995 | struct cgroup *cgroup, | 4994 | struct cgroup *cgroup, |
4996 | struct task_struct *p, | 4995 | struct task_struct *p) |
4997 | bool threadgroup) | ||
4998 | { | 4996 | { |
4999 | mem_cgroup_clear_mc(); | 4997 | mem_cgroup_clear_mc(); |
5000 | } | 4998 | } |
@@ -5112,8 +5110,7 @@ retry: | |||
5112 | static void mem_cgroup_move_task(struct cgroup_subsys *ss, | 5110 | static void mem_cgroup_move_task(struct cgroup_subsys *ss, |
5113 | struct cgroup *cont, | 5111 | struct cgroup *cont, |
5114 | struct cgroup *old_cont, | 5112 | struct cgroup *old_cont, |
5115 | struct task_struct *p, | 5113 | struct task_struct *p) |
5116 | bool threadgroup) | ||
5117 | { | 5114 | { |
5118 | struct mm_struct *mm; | 5115 | struct mm_struct *mm; |
5119 | 5116 | ||
@@ -5131,22 +5128,19 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss, | |||
5131 | #else /* !CONFIG_MMU */ | 5128 | #else /* !CONFIG_MMU */ |
5132 | static int mem_cgroup_can_attach(struct cgroup_subsys *ss, | 5129 | static int mem_cgroup_can_attach(struct cgroup_subsys *ss, |
5133 | struct cgroup *cgroup, | 5130 | struct cgroup *cgroup, |
5134 | struct task_struct *p, | 5131 | struct task_struct *p) |
5135 | bool threadgroup) | ||
5136 | { | 5132 | { |
5137 | return 0; | 5133 | return 0; |
5138 | } | 5134 | } |
5139 | static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss, | 5135 | static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss, |
5140 | struct cgroup *cgroup, | 5136 | struct cgroup *cgroup, |
5141 | struct task_struct *p, | 5137 | struct task_struct *p) |
5142 | bool threadgroup) | ||
5143 | { | 5138 | { |
5144 | } | 5139 | } |
5145 | static void mem_cgroup_move_task(struct cgroup_subsys *ss, | 5140 | static void mem_cgroup_move_task(struct cgroup_subsys *ss, |
5146 | struct cgroup *cont, | 5141 | struct cgroup *cont, |
5147 | struct cgroup *old_cont, | 5142 | struct cgroup *old_cont, |
5148 | struct task_struct *p, | 5143 | struct task_struct *p) |
5149 | bool threadgroup) | ||
5150 | { | 5144 | { |
5151 | } | 5145 | } |
5152 | #endif | 5146 | #endif |