diff options
| author | Kirill Tkhai <tkhai@yandex.ru> | 2014-04-10 15:38:36 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-17 13:39:51 +0200 |
| commit | a1d9a3231eac4117cadaf4b6bba5b2902c15a33e (patch) | |
| tree | ea81cd4c9553b0ae0adb4357b578ba3cefc2dccf /kernel/sched/rt.c | |
| parent | sched/numa: Fix task_numa_free() lockdep splat (diff) | |
| download | linux-a1d9a3231eac4117cadaf4b6bba5b2902c15a33e.tar.xz linux-a1d9a3231eac4117cadaf4b6bba5b2902c15a33e.zip | |
sched: Check for stop task appearance when balancing happens
We need to do it like we do for the other higher priority classes..
Signed-off-by: Kirill Tkhai <tkhai@yandex.ru>
Cc: Michael wang <wangyun@linux.vnet.ibm.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/336561397137116@web27h.yandex.ru
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/rt.c')
| -rw-r--r-- | kernel/sched/rt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index d8cdf1618551..bd2267ad404f 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1362,10 +1362,11 @@ pick_next_task_rt(struct rq *rq, struct task_struct *prev) pull_rt_task(rq); /* * pull_rt_task() can drop (and re-acquire) rq->lock; this - * means a dl task can slip in, in which case we need to - * re-start task selection. + * means a dl or stop task can slip in, in which case we need + * to re-start task selection. */ - if (unlikely(rq->dl.dl_nr_running)) + if (unlikely((rq->stop && rq->stop->on_rq) || + rq->dl.dl_nr_running)) return RETRY_TASK; } |