summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-12 19:44:13 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-12 19:44:13 +0200
commitb55ee2816ed6d8f8a00d4badab0e3642ffbac19f (patch)
tree8923b88f34f8e24e5b65a0f5aa8a366127fcdc6a /kernel
parentvfs: make getcwd() get the root and pwd path under rcu (diff)
parentsched: Fix load balancing performance regression in should_we_balance() (diff)
downloadlinux-b55ee2816ed6d8f8a00d4badab0e3642ffbac19f.tar.xz
linux-b55ee2816ed6d8f8a00d4badab0e3642ffbac19f.zip
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Ingo Molnar: "Performance regression fix" * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched: Fix load balancing performance regression in should_we_balance()
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 7f0a5e6cdae0..9b3fe1cd8f40 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5151,7 +5151,7 @@ static int should_we_balance(struct lb_env *env)
* First idle cpu or the first cpu(busiest) in this sched group
* is eligible for doing load balancing at this and above domains.
*/
- return balance_cpu != env->dst_cpu;
+ return balance_cpu == env->dst_cpu;
}
/*