diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2010-02-16 16:48:56 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-16 16:48:56 +0100 |
| commit | 6e40f5bbbc734231bc5809d3eb785e3c21f275d7 (patch) | |
| tree | 8520fc84d9643502ebe86233cefcd774e2babf72 /include/linux/sched.h | |
| parent | kthread, sched: Remove reference to kthread_create_on_cpu (diff) | |
| parent | sched: Fix race between ttwu() and task_rq_lock() (diff) | |
| download | linux-dev-6e40f5bbbc734231bc5809d3eb785e3c21f275d7.tar.xz linux-dev-6e40f5bbbc734231bc5809d3eb785e3c21f275d7.zip | |
Merge branch 'sched/urgent' into sched/core
Conflicts: kernel/sched.c
Necessary due to the urgent fixes which conflict with the code move
from sched.c to sched_fair.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index b1b8d84c5805..0eef87b58ea5 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -870,7 +870,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) |