summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 10:23:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 10:23:41 -0800
commit2531216f236cb2a1f39ffa12a4a9339541e52191 (patch)
tree74ca94a99a00ebca463ca67458b8099728cece15 /include
parent6556a6743549defc32e5f90ee2cb1ecd833a44c3 (diff)
parent0970d2992dfd7d5ec2c787417cf464f01eeaf42a (diff)
downloadop-kernel-dev-2531216f236cb2a1f39ffa12a4a9339541e52191.zip
op-kernel-dev-2531216f236cb2a1f39ffa12a4a9339541e52191.tar.gz
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Fix race between ttwu() and task_rq_lock() sched: Fix SMT scheduler regression in find_busiest_queue() sched: Fix sched_mv_power_savings for !SMT kernel/sched.c: Suppress unused var warning
Diffstat (limited to 'include')
-rw-r--r--include/linux/sched.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 78efe7c..1f5fa53 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -878,7 +878,10 @@ static inline int sd_balance_for_mc_power(void)
if (sched_smt_power_savings)
return SD_POWERSAVINGS_BALANCE;
- return SD_PREFER_SIBLING;
+ if (!sched_mc_power_savings)
+ return SD_PREFER_SIBLING;
+
+ return 0;
}
static inline int sd_balance_for_package_power(void)
OpenPOWER on IntegriCloud