diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-10-15 15:24:15 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-10-22 14:16:45 +0200 |
commit | b2b5ce022acf5e9f52f7b78c5579994fdde191d4 (patch) | |
tree | 15e7d1742b530cdbe7b0734378e7f043b9a5faac /kernel/sched.c | |
parent | b7dadc38797584f6203386da1947ed5edf516646 (diff) | |
download | blackbird-op-linux-b2b5ce022acf5e9f52f7b78c5579994fdde191d4.tar.gz blackbird-op-linux-b2b5ce022acf5e9f52f7b78c5579994fdde191d4.zip |
sched, cgroup: Fixup broken cgroup movement
Dima noticed that we fail to correct the ->vruntime of sleeping tasks
when we move them between cgroups.
Reported-by: Dima Zavin <dima@android.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Tested-by: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1287150604.29097.1513.camel@twins>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 5998222f901c..3fe253e6a6e9 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -8498,12 +8498,12 @@ void sched_move_task(struct task_struct *tsk) if (unlikely(running)) tsk->sched_class->put_prev_task(rq, tsk); - set_task_rq(tsk, task_cpu(tsk)); - #ifdef CONFIG_FAIR_GROUP_SCHED - if (tsk->sched_class->moved_group) - tsk->sched_class->moved_group(tsk, on_rq); + if (tsk->sched_class->task_move_group) + tsk->sched_class->task_move_group(tsk, on_rq); + else #endif + set_task_rq(tsk, task_cpu(tsk)); if (unlikely(running)) tsk->sched_class->set_curr_task(rq); |