From patchwork Thu Mar 13 05:57:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 26174 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3B0EC236AC for ; Thu, 13 Mar 2014 06:06:00 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id jt11sf1391916pbb.3 for ; Wed, 12 Mar 2014 23:05:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=OiYPNAi1M0ACjW9SLJvey/JGaG1HdLFXa2vNKjO6KVw=; b=f3Z+p7ByypyBxgV2Lo7fvXv3R+kCY8w9VD/84aN/boq8GaytX2aa17NuiMXNnHvtgx ecgJcIHymxn7BtIq2YgmnghvVg8eYnypoWYGKtg4G3Yndov96UDReaAf/SgYEudDqVos +JgwCTsTDCGLakYANa3W7dIMTMkC7cUohsTv6HntNsAWwmA/XttMwewYKSVNzDTIooAQ CvGK3mzN2Sqfyqqk9jIynb0pnoKjT3j0lWA0hHFloOYt9Akv/zEECfRmWKzOR+q/pmzU 9dRlstqaeOtDtTUsVMu4cEdAkjyi3J4I3+jVddlE6EFSEXgfrHsxHJ1NVhfxkOPUqmR4 MQWg== X-Gm-Message-State: ALoCoQm6uv/5FhPn1v7nrG5fqxzTR5+Zk5+24xS/QWOs/xzB8GOyUZADlP8VV9acPk2k6qby52fl X-Received: by 10.66.102.8 with SMTP id fk8mr41375pab.24.1394690759475; Wed, 12 Mar 2014 23:05:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.11 with SMTP id w11ls144667qgw.42.gmail; Wed, 12 Mar 2014 23:05:59 -0700 (PDT) X-Received: by 10.52.165.237 with SMTP id zb13mr16487vdb.76.1394690759366; Wed, 12 Mar 2014 23:05:59 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id xb4si451984vdc.77.2014.03.12.23.05.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Mar 2014 23:05:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id pa12so605735veb.1 for ; Wed, 12 Mar 2014 23:05:59 -0700 (PDT) X-Received: by 10.58.12.169 with SMTP id z9mr150795veb.61.1394690759281; Wed, 12 Mar 2014 23:05:59 -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.220.78.9 with SMTP id i9csp343378vck; Wed, 12 Mar 2014 23:05:58 -0700 (PDT) X-Received: by 10.68.196.137 with SMTP id im9mr1957758pbc.105.1394690758320; Wed, 12 Mar 2014 23:05:58 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bq3si1142171pbd.86.2014.03.12.23.05.57; Wed, 12 Mar 2014 23:05:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753395AbaCMGFv (ORCPT + 26 others); Thu, 13 Mar 2014 02:05:51 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:37056 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751267AbaCMGFu (ORCPT ); Thu, 13 Mar 2014 02:05:50 -0400 Received: by mail-pb0-f41.google.com with SMTP id jt11so624634pbb.28 for ; Wed, 12 Mar 2014 23:05:50 -0700 (PDT) X-Received: by 10.67.8.102 with SMTP id dj6mr167037pad.10.1394690749991; Wed, 12 Mar 2014 23:05:49 -0700 (PDT) Received: from localhost.localdomain ([116.232.110.156]) by mx.google.com with ESMTPSA id ix2sm3136331pbc.45.2014.03.12.23.05.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Mar 2014 23:05:49 -0700 (PDT) From: Alex Shi To: mingo@redhat.com, peterz@infradead.org, morten.rasmussen@arm.com Cc: vincent.guittot@linaro.org, daniel.lezcano@linaro.org, fweisbec@gmail.com, linux@arm.linux.org.uk, tony.luck@intel.com, fenghua.yu@intel.com, james.hogan@imgtec.com, alex.shi@linaro.org, jason.low2@hp.com, viresh.kumar@linaro.org, hanjun.guo@linaro.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, akpm@linux-foundation.org, arjan@linux.intel.com, pjt@google.com, fengguang.wu@intel.com, linaro-kernel@lists.linaro.org, wangyun@linux.vnet.ibm.com, mgorman@suse.de Subject: [PATCH 8/8] sched: rename update_*_cpu_load Date: Thu, 13 Mar 2014 13:57:29 +0800 Message-Id: <1394690249-14130-9-git-send-email-alex.shi@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1394690249-14130-1-git-send-email-alex.shi@linaro.org> References: <1394690249-14130-1-git-send-email-alex.shi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: alex.shi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Since we have no cpu_load update, rename the related functions: s/update_idle_cpu_load/update_idle_rt_avg/ s/update_cpu_load_nohz/update_rt_avg_nohz/ s/update_cpu_load_active/update_avg_load_active/ No functional change. Signed-off-by: Alex Shi --- include/linux/sched.h | 2 +- kernel/sched/core.c | 2 +- kernel/sched/fair.c | 2 +- kernel/sched/proc.c | 8 ++++---- kernel/sched/sched.h | 4 ++-- kernel/time/tick-sched.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 60c18de..26727fc 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -174,7 +174,7 @@ extern unsigned long this_cpu_load(void); extern void calc_global_load(unsigned long ticks); -extern void update_cpu_load_nohz(void); +extern void update_rt_avg_nohz(void); extern unsigned long get_parent_ip(unsigned long addr); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index f271997..bfa63fd 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2429,7 +2429,7 @@ void scheduler_tick(void) raw_spin_lock(&rq->lock); update_rq_clock(rq); curr->sched_class->task_tick(rq, curr, 0); - update_cpu_load_active(rq); + update_avg_load_active(rq); raw_spin_unlock(&rq->lock); perf_event_task_tick(); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6469907..814699b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7012,7 +7012,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) raw_spin_lock_irq(&rq->lock); update_rq_clock(rq); - update_idle_cpu_load(rq); + update_idle_rt_avg(rq); raw_spin_unlock_irq(&rq->lock); rebalance_domains(rq, CPU_IDLE); diff --git a/kernel/sched/proc.c b/kernel/sched/proc.c index dd3c2d9..42b7706 100644 --- a/kernel/sched/proc.c +++ b/kernel/sched/proc.c @@ -423,7 +423,7 @@ static void calc_load_account_active(struct rq *this_rq) * Called from nohz_idle_balance() to update the load ratings before doing the * idle balance. */ -void update_idle_cpu_load(struct rq *this_rq) +void update_idle_rt_avg(struct rq *this_rq) { unsigned long curr_jiffies = ACCESS_ONCE(jiffies); @@ -440,17 +440,17 @@ void update_idle_cpu_load(struct rq *this_rq) /* * Called from tick_nohz_idle_exit() */ -void update_cpu_load_nohz(void) +void update_rt_avg_nohz(void) { struct rq *this_rq = this_rq(); - update_idle_cpu_load(this_rq); + update_idle_rt_avg(this_rq); } #endif /* CONFIG_NO_HZ */ /* * Called from scheduler_tick() */ -void update_cpu_load_active(struct rq *this_rq) +void update_avg_load_active(struct rq *this_rq) { this_rq->last_load_update_tick = jiffies; sched_avg_update(this_rq); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index a5391cf..51409ef 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -21,7 +21,7 @@ extern unsigned long calc_load_update; extern atomic_long_t calc_load_tasks; extern long calc_load_fold_active(struct rq *this_rq); -extern void update_cpu_load_active(struct rq *this_rq); +extern void update_avg_load_active(struct rq *this_rq); /* * Helpers for converting nanosecond timing to jiffy resolution @@ -1209,7 +1209,7 @@ extern void init_dl_task_timer(struct sched_dl_entity *dl_se); unsigned long to_ratio(u64 period, u64 runtime); -extern void update_idle_cpu_load(struct rq *this_rq); +extern void update_idle_rt_avg(struct rq *this_rq); extern void init_task_runnable_average(struct task_struct *p); diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 9f8af69..b1a400a 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -866,7 +866,7 @@ static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now) { /* Update jiffies first */ tick_do_update_jiffies64(now); - update_cpu_load_nohz(); + update_rt_avg_nohz(); calc_load_exit_idle(); touch_softlockup_watchdog();