From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753072AbbC0LlP (ORCPT ); Fri, 27 Mar 2015 07:41:15 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37066 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932111AbbC0LlL (ORCPT ); Fri, 27 Mar 2015 07:41:11 -0400 Date: Fri, 27 Mar 2015 04:40:35 -0700 From: tip-bot for Vincent Guittot Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, vincent.guittot@linaro.org, morten.rasmussen@arm.com, hpa@zytor.com, tglx@linutronix.de Reply-To: mingo@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, vincent.guittot@linaro.org, morten.rasmussen@arm.com, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <1425052454-25797-4-git-send-email-vincent.guittot@linaro.org> References: <1425052454-25797-4-git-send-email-vincent.guittot@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched: Remove frequency scaling from cpu_capacity Git-Commit-ID: a8faa8f55d48496f64d96df48298e54fd380f6af X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a8faa8f55d48496f64d96df48298e54fd380f6af Gitweb: http://git.kernel.org/tip/a8faa8f55d48496f64d96df48298e54fd380f6af Author: Vincent Guittot AuthorDate: Fri, 27 Feb 2015 16:54:06 +0100 Committer: Ingo Molnar CommitDate: Fri, 27 Mar 2015 09:35:59 +0100 sched: Remove frequency scaling from cpu_capacity Now that arch_scale_cpu_capacity has been introduced to scale the original capacity, the arch_scale_freq_capacity is no longer used (it was previously used by ARM arch). Remove arch_scale_freq_capacity from the computation of cpu_capacity. The frequency invariance will be handled in the load tracking and not in the CPU capacity. arch_scale_freq_capacity will be revisited for scaling load with the current frequency of the CPUs in a later patch. Signed-off-by: Vincent Guittot Signed-off-by: Peter Zijlstra (Intel) Acked-by: Morten Rasmussen Cc: Morten.Rasmussen@arm.com Cc: dietmar.eggemann@arm.com Cc: efault@gmx.de Cc: kamalesh@linux.vnet.ibm.com Cc: linaro-kernel@lists.linaro.org Cc: nicolas.pitre@linaro.org Cc: preeti@linux.vnet.ibm.com Cc: riel@redhat.com Link: http://lkml.kernel.org/r/1425052454-25797-4-git-send-email-vincent.guittot@linaro.org Signed-off-by: Ingo Molnar --- kernel/sched/fair.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index d94a865..e54231f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6042,13 +6042,6 @@ static void update_cpu_capacity(struct sched_domain *sd, int cpu) sdg->sgc->capacity_orig = capacity; - if (sched_feat(ARCH_CAPACITY)) - capacity *= arch_scale_freq_capacity(sd, cpu); - else - capacity *= default_scale_capacity(sd, cpu); - - capacity >>= SCHED_CAPACITY_SHIFT; - capacity *= scale_rt_capacity(cpu); capacity >>= SCHED_CAPACITY_SHIFT;