From d0151dae11a811596f8bd8280b2b2e4425cc6ae6 Mon Sep 17 00:00:00 2001 From: Vaidyanathan Srinivasan Date: Mon, 8 Feb 2010 15:35:55 +0530 Subject: [PATCH] --- yaml --- r: 182493 b: refs/heads/master c: 28f5318167adf23b16c844b9c2253f355cb21796 h: refs/heads/master i: 182491: dba9406612c07c353708e538f4669f763997516f v: v3 --- [refs] | 2 +- trunk/include/linux/sched.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 53bb955e9309..a444621365a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50200df462023b187d80a99a52f5f2cfe3c86c26 +refs/heads/master: 28f5318167adf23b16c844b9c2253f355cb21796 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 78efe7c485ac..1f5fa53b46b1 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/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)