From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757482AbZCRJXv (ORCPT ); Wed, 18 Mar 2009 05:23:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756545AbZCRJWt (ORCPT ); Wed, 18 Mar 2009 05:22:49 -0400 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:46760 "EHLO e23smtp03.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757136AbZCRJWs (ORCPT ); Wed, 18 Mar 2009 05:22:48 -0400 From: Gautham R Shenoy Subject: [PATCH 3 4/6] sched: Rename the variable sched_mc_preferred_wakeup_cpu To: "Vaidyanathan Srinivasan" , "Peter Zijlstra" , "Ingo Molnar" Cc: linux-kernel@vger.kernel.org, "Suresh Siddha" , "Balbir Singh" , Gautham R Shenoy Date: Wed, 18 Mar 2009 14:52:38 +0530 Message-ID: <20090318092238.24787.6657.stgit@sofia.in.ibm.com> In-Reply-To: <20090318092054.24787.18730.stgit@sofia.in.ibm.com> References: <20090318092054.24787.18730.stgit@sofia.in.ibm.com> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sched_mc_ preferred_wakeup_cpu is currently used when the user seeks power savings through aggressive task consolidation. This is applicable for both sched_mc_power_savings as well as sched_smt_power_savings. So rename sched_mc_preferred_wakeup_cpu to preferred_wakeup_cpu. Also fix the comment for preferred_wakeup_cpu. Signed-off-by: Gautham R Shenoy --- kernel/sched.c | 12 +++++++----- kernel/sched_fair.c | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/kernel/sched.c b/kernel/sched.c index 864c6ca..16d7655 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -515,11 +515,13 @@ struct root_domain { #endif #if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT) /* - * Preferred wake up cpu nominated by sched_mc balance that will be - * used when most cpus are idle in the system indicating overall very - * low system utilisation. Triggered at POWERSAVINGS_BALANCE_WAKEUP(2) + * Preferred wake up cpu which is nominated by load balancer, + * is the CPU on which the tasks would be woken up, which + * otherwise would have woken up on an idle CPU even on a system + * with low-cpu-utilization. + * This is triggered at POWERSAVINGS_BALANCE_WAKEUP(2). */ - unsigned int sched_mc_preferred_wakeup_cpu; + unsigned int preferred_wakeup_cpu; #endif }; @@ -3416,7 +3418,7 @@ out_balanced: if (this == group_leader && group_leader != group_min) { *imbalance = min_load_per_task; if (active_power_savings_level >= POWERSAVINGS_BALANCE_WAKEUP) { - cpu_rq(this_cpu)->rd->sched_mc_preferred_wakeup_cpu = + cpu_rq(this_cpu)->rd->preferred_wakeup_cpu = cpumask_first(sched_group_cpus(group_leader)); } return group_min; diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index a3583c6..03b1e3c 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -1052,7 +1052,7 @@ static int wake_idle(int cpu, struct task_struct *p) this_cpu = smp_processor_id(); chosen_wakeup_cpu = - cpu_rq(this_cpu)->rd->sched_mc_preferred_wakeup_cpu; + cpu_rq(this_cpu)->rd->preferred_wakeup_cpu; if (active_power_savings_level >= POWERSAVINGS_BALANCE_WAKEUP && idle_cpu(cpu) && idle_cpu(this_cpu) &&