1 files changed, 8 insertions, 8 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 94da8ee9e2c2..00d4fa27d3e6 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5391,8 +5391,9 @@ static void mem_cgroup_clear_mc(void)
 
 static int mem_cgroup_can_attach(struct cgroup_subsys *ss,
                                 struct cgroup *cgroup,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
+        struct task_struct *p = cgroup_taskset_first(tset);
         int ret = 0;
         struct mem_cgroup *memcg = mem_cgroup_from_cont(cgroup);
 
@@ -5430,7 +5431,7 @@ static int mem_cgroup_can_attach(struct cgroup_subsys *ss,
 
 static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss,
                                 struct cgroup *cgroup,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
         mem_cgroup_clear_mc();
 }
@@ -5547,9 +5548,9 @@ retry:
 
 static void mem_cgroup_move_task(struct cgroup_subsys *ss,
                                 struct cgroup *cont,
-                                struct cgroup *old_cont,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
+        struct task_struct *p = cgroup_taskset_first(tset);
         struct mm_struct *mm = get_task_mm(p);
 
         if (mm) {
@@ -5564,19 +5565,18 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss,
 #else   /* !CONFIG_MMU */
 static int mem_cgroup_can_attach(struct cgroup_subsys *ss,
                                 struct cgroup *cgroup,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
         return 0;
 }
 static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss,
                                 struct cgroup *cgroup,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
 }
 static void mem_cgroup_move_task(struct cgroup_subsys *ss,
                                 struct cgroup *cont,
-                                struct cgroup *old_cont,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
 }
 #endif