diff options
| author | Kirill Tkhai <ktkhai@parallels.com> | 2014-03-06 16:16:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-03-11 12:05:41 +0100 |
| commit | 35805ff8f4fc535ac85330170d3c56829c87c677 (patch) | |
| tree | ea7e8888f939f3d1ec63a5d30649f68fb4fe5bd7 /kernel/sched | |
| parent | sched/core: Fix endless loop in pick_next_task() (diff) | |
| download | linux-35805ff8f4fc535ac85330170d3c56829c87c677.tar.xz linux-35805ff8f4fc535ac85330170d3c56829c87c677.zip | |
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>
Diffstat (limited to 'kernel/sched')
| -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 10db4a87ad72..f1eedae1e83e 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6710,7 +6710,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; } |