Message ID | 1406569906-9763-6-git-send-email-vincent.guittot@linaro.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <patchwork-forward+bncBCPZXIGQSEHBBFNA3KPAKGQE6QGSXOY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3A088202E4 for <linaro@patches.linaro.org>; Mon, 28 Jul 2014 18:01:58 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id ho1sf2630080wib.9 for <linaro@patches.linaro.org>; Mon, 28 Jul 2014 11:01:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=pkyi+qkJdvjqjXTNLN7zvbc85W/mjs2gOkFq2DQqMIk=; b=kBOUoXiET/BBpYMmUS17oEQGJu0mdHk2fUXCP0whaQ43xpy7Q9RLTrTpTFNx5J9p8a cAGybmCEh0OBlAEtxOXkYNZPe0zU/xNWdY+7/IV3Z8w9ZonNRoAId4WL9vaUKWRqzH8n eGClNPUjRRoNAv1mAr5vnb0kqDyHqo/k3XaIQrgLev2v+KV2EjnEjmvbM8hiFvGAFS27 sMGUOdjrbMV+jI0cC7jiLgwTgF9JRFtScjbPAbKITDzhnTXaT6v/wUV9d6JSq4DY4l92 R/GKxFNgUdGT2QTkuk2moaup5KvJJtrOgD7Wk6HSjfXgQyrTVQc3HML97XxnkAD9H3qJ p67w== X-Gm-Message-State: ALoCoQk6masTRtIPLX6Z+481yUfdotVGetQIyu/hC9GnWU64eaq1Tj15ZrAmM1PGYpAgmfQ0ypvK X-Received: by 10.194.103.133 with SMTP id fw5mr3619979wjb.3.1406570517096; Mon, 28 Jul 2014 11:01:57 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.35 with SMTP id k32ls2139531qgd.73.gmail; Mon, 28 Jul 2014 11:01:56 -0700 (PDT) X-Received: by 10.52.37.81 with SMTP id w17mr3106096vdj.95.1406570516746; Mon, 28 Jul 2014 11:01:56 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id wz6si13028083vcb.13.2014.07.28.11.01.56 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 11:01:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id hq11so11903290vcb.2 for <patchwork-forward@linaro.org>; Mon, 28 Jul 2014 11:01:56 -0700 (PDT) X-Received: by 10.52.129.200 with SMTP id ny8mr39493267vdb.27.1406570516658; Mon, 28 Jul 2014 11:01:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp186418vcb; Mon, 28 Jul 2014 11:01:56 -0700 (PDT) X-Received: by 10.70.88.205 with SMTP id bi13mr40755007pdb.43.1406570121755; Mon, 28 Jul 2014 10:55:21 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id nl15si9301759pdb.117.2014.07.28.10.55.10 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jul 2014 10:55:21 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XBp7k-00014V-Cb; Mon, 28 Jul 2014 17:54:12 +0000 Received: from mail-we0-f172.google.com ([74.125.82.172]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XBp6n-0000Cw-0V for linux-arm-kernel@lists.infradead.org; Mon, 28 Jul 2014 17:53:13 +0000 Received: by mail-we0-f172.google.com with SMTP id x48so7763024wes.3 for <linux-arm-kernel@lists.infradead.org>; Mon, 28 Jul 2014 10:52:45 -0700 (PDT) X-Received: by 10.194.62.110 with SMTP id x14mr51623148wjr.15.1406569964918; Mon, 28 Jul 2014 10:52:44 -0700 (PDT) Received: from lmenx30s.lme.st.com (LPuteaux-656-01-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id ex4sm33758149wic.2.2014.07.28.10.52.43 for <multiple recipients> (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 10:52:44 -0700 (PDT) From: Vincent Guittot <vincent.guittot@linaro.org> To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, preeti@linux.vnet.ibm.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 05/12] ARM: topology: use new cpu_capacity interface Date: Mon, 28 Jul 2014 19:51:39 +0200 Message-Id: <1406569906-9763-6-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406569906-9763-1-git-send-email-vincent.guittot@linaro.org> References: <1406569906-9763-1-git-send-email-vincent.guittot@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140728_105313_196473_4440B73E X-CRM114-Status: GOOD ( 10.44 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.172 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.172 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: nicolas.pitre@linaro.org, riel@redhat.com, daniel.lezcano@linaro.org, Vincent Guittot <vincent.guittot@linaro.org>, efault@gmx.de, dietmar.eggemann@arm.com, linaro-kernel@lists.linaro.org, Morten.Rasmussen@arm.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: vincent.guittot@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index e35d880..89cfdd6 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -42,7 +42,7 @@ */ static DEFINE_PER_CPU(unsigned long, cpu_scale); -unsigned long arch_scale_freq_capacity(struct sched_domain *sd, int cpu) +unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) { return per_cpu(cpu_scale, cpu); } @@ -166,7 +166,7 @@ static void update_cpu_capacity(unsigned int cpu) set_capacity_scale(cpu, cpu_capacity(cpu) / middle_capacity); printk(KERN_INFO "CPU%u: update cpu_capacity %lu\n", - cpu, arch_scale_freq_capacity(NULL, cpu)); + cpu, arch_scale_cpu_capacity(NULL, cpu)); } #else
Use the new arch_scale_cpu_capacity in order to reflect the original capacity of a CPU instead of arch_scale_freq_capacity which is more linked to a scaling of the capacity linked to the frequency. Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> --- arch/arm/kernel/topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)