diff options
| author | Tejun Heo <tj@kernel.org> | 2015-12-03 10:22:52 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-12-03 10:22:52 -0500 |
| commit | 8075b542cf9f5d8a6afd92b4a940e29a677a7510 (patch) | |
| tree | c2075c5fa70b16d086871edaf94febd954fec073 /kernel/sched | |
| parent | d2b4365809060b256330a99289de9797a5dd6967 (diff) | |
| parent | 67cde9c4938945b9510730c64e68d2f1dd7bc0aa (diff) | |
Merge branch 'for-4.4-fixes' into for-4.5
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 4d568ac9319e..a9db4819e586 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8217,12 +8217,12 @@ static void cpu_cgroup_fork(struct task_struct *task, void *private) sched_move_task(task); } -static int cpu_cgroup_can_attach(struct cgroup_subsys_state *css, - struct cgroup_taskset *tset) +static int cpu_cgroup_can_attach(struct cgroup_taskset *tset) { struct task_struct *task; + struct cgroup_subsys_state *css; - cgroup_taskset_for_each(task, tset) { + cgroup_taskset_for_each(task, css, tset) { #ifdef CONFIG_RT_GROUP_SCHED if (!sched_rt_can_attach(css_tg(css), task)) return -EINVAL; @@ -8235,12 +8235,12 @@ static int cpu_cgroup_can_attach(struct cgroup_subsys_state *css, return 0; } -static void cpu_cgroup_attach(struct cgroup_subsys_state *css, - struct cgroup_taskset *tset) +static void cpu_cgroup_attach(struct cgroup_taskset *tset) { struct task_struct *task; + struct cgroup_subsys_state *css; - cgroup_taskset_for_each(task, tset) + cgroup_taskset_for_each(task, css, tset) sched_move_task(task); } |