From 6570b11ba5b26680b3ef11a68b44de68d4130bbe Mon Sep 17 00:00:00 2001 From: Daisuke Nishimura Date: Thu, 15 Dec 2011 14:37:41 +0900 Subject: [PATCH] --- yaml --- r: 277411 b: refs/heads/master c: 62af3783e4fd8ba9e28416e8e91cb3bdd9fb133e h: refs/heads/master i: 277409: a55d4865dc78cb73edbaefe29c565b9592104928 277407: 6f115b40aff3c0539f46abce4e64fb6f28cc0dd6 v: v3 --- [refs] | 2 +- trunk/kernel/sched/fair.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d9411c05f31a..ed3df1c5c95a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ceff013c43c0f38f0d26c79507889c6791c0ea0 +refs/heads/master: 62af3783e4fd8ba9e28416e8e91cb3bdd9fb133e diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c index 2d1ac6e2386d..bdf18836f74e 100644 --- a/trunk/kernel/sched/fair.c +++ b/trunk/kernel/sched/fair.c @@ -5344,11 +5344,13 @@ static void task_move_group_fair(struct task_struct *p, int on_rq) * * - Moving a forked child which is waiting for being woken up by * wake_up_new_task(). + * - Moving a task which has been woken up by try_to_wake_up() and + * waiting for actually being woken up by sched_ttwu_pending(). * * To prevent boost or penalty in the new cfs_rq caused by delta * min_vruntime between the two cfs_rqs, we skip vruntime adjustment. */ - if (!on_rq && !p->se.sum_exec_runtime) + if (!on_rq && (!p->se.sum_exec_runtime || p->state == TASK_WAKING)) on_rq = 1; if (!on_rq)