diff options
| author | Kirill Tkhai <ktkhai@parallels.com> | 2014-03-06 19:16:15 +0400 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-12-02 22:36:55 +0800 |
| commit | 2316b9ffaabd4221a7c1b71a7dd8640d234143a4 (patch) | |
| tree | 329099b8b1a0be800492ea0de95577530c2e7f07 | |
| parent | d3b69096a5d78e87a34e50681f6f66b2b4ecb8ab (diff) | |
sched/fair: Fix endless loop in idle_balance()
Check for fair tasks number to decide, that we've pulled a task.
rq's nr_running may contain throttled RT tasks.
Signed-off-by: Kirill Tkhai <ktkhai@parallels.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1394118975.19290.104.camel@tkhai
Signed-off-by: Ingo Molnar <mingo@kernel.org>
(cherry picked from commit 35805ff8f4fc535ac85330170d3c56829c87c677)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
| -rw-r--r-- | kernel/sched/fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 65257ffd6b9..59de4d6e87e 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5579,7 +5579,7 @@ static int idle_balance(struct rq *this_rq) * While browsing the domains, we released the rq lock. * A task could have be enqueued in the meantime */ - if (this_rq->nr_running && !pulled_task) { + if (this_rq->cfs.h_nr_running && !pulled_task) { pulled_task = 1; goto out; } |