summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPaul Turner <pjt@google.com>2011-11-07 20:26:34 -0800
committerIngo Molnar <mingo@elte.hu>2011-11-16 08:43:45 +0100
commitfccfdc6f0d8c83c854eeb6d93aa158f0e551bd49 (patch)
treed3a397152c6bff8675350e58e2aceb4ec34c1108 /kernel
parent4dcfe1025b513c2c1da5bf5586adb0e80148f612 (diff)
downloadlinux-stable-fccfdc6f0d8c83c854eeb6d93aa158f0e551bd49.tar.gz
linux-stable-fccfdc6f0d8c83c854eeb6d93aa158f0e551bd49.tar.bz2
linux-stable-fccfdc6f0d8c83c854eeb6d93aa158f0e551bd49.zip
sched: Fix buglet in return_cfs_rq_runtime()
In return_cfs_rq_runtime() we want to return bandwidth when there are no remaining tasks, not "return" when this is the case. Signed-off-by: Paul Turner <pjt@google.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/20111108042736.623812423@google.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched_fair.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index ba0e1f49a22f..a78ed2736ba7 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1756,7 +1756,7 @@ static void __return_cfs_rq_runtime(struct cfs_rq *cfs_rq)
static __always_inline void return_cfs_rq_runtime(struct cfs_rq *cfs_rq)
{
- if (!cfs_rq->runtime_enabled || !cfs_rq->nr_running)
+ if (!cfs_rq->runtime_enabled || cfs_rq->nr_running)
return;
__return_cfs_rq_runtime(cfs_rq);