From patchwork Wed Apr 16 02:43: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: 28441 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A19FF2036D for ; Wed, 16 Apr 2014 02:45:53 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id w8sf29639120qac.8 for ; Tue, 15 Apr 2014 19:45:53 -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=ud/axqqiIBQ+mhMrbmnFCT8gQ0MOBPfEQhbp7IIpQ4o=; b=PYmlemBsCdY2sG0949W75gXIOHZ+2X5QfnlL96PTkrTaj+XD6B6fk+G4uGWBbdzNNF wKduVtbKjNjrsLG3P0ec5OD5qAZlLPdm6UgGus7s8qbO/+8H+6qwelhGXfh04TLkJemY TmZ6EHvOnM2Q0jVbkoRRxcMZ/tr8fGcNzJ9lb5V+H56t9gxzUCuQ4pQ1QXgIFiQTRQIC iuxSW3Iu3pc1KZywiZxfI3D4LwtTGFxrTqWEERNX4tanksbJPRynPUEvno67sPGNwV1c kY8iOMeNoXCSvjXtioLnqkgy9ZojS0Z3JBVxtPULgw/415Hckd9bFzDgg9Hp6IYNs/La kurw== X-Gm-Message-State: ALoCoQn5d9ICRB3vwXPd2+5ROGu87O2MozMDSgK3D0sfSQXq8PGa+q0VMshBXci7o5Np/TNeQgaI X-Received: by 10.236.182.230 with SMTP id o66mr2183088yhm.12.1397616353339; Tue, 15 Apr 2014 19:45:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.11 with SMTP id c11ls183396qge.55.gmail; Tue, 15 Apr 2014 19:45:53 -0700 (PDT) X-Received: by 10.224.64.132 with SMTP id e4mr1786269qai.16.1397616353275; Tue, 15 Apr 2014 19:45:53 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id 5si7545783yhd.95.2014.04.15.19.45.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Apr 2014 19:45:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.179 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.179; Received: by mail-ve0-f179.google.com with SMTP id db12so9947022veb.38 for ; Tue, 15 Apr 2014 19:45:53 -0700 (PDT) X-Received: by 10.220.106.84 with SMTP id w20mr54846vco.18.1397616352970; Tue, 15 Apr 2014 19:45:52 -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.221.72 with SMTP id ib8csp277748vcb; Tue, 15 Apr 2014 19:45:52 -0700 (PDT) X-Received: by 10.66.191.134 with SMTP id gy6mr5649511pac.27.1397616352175; Tue, 15 Apr 2014 19:45:52 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l1si11829336paw.274.2014.04.15.19.45.51; Tue, 15 Apr 2014 19:45:51 -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 S1752962AbaDPCpg (ORCPT + 26 others); Tue, 15 Apr 2014 22:45:36 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:64480 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751852AbaDPCoz (ORCPT ); Tue, 15 Apr 2014 22:44:55 -0400 Received: by mail-pa0-f54.google.com with SMTP id lf10so10372883pab.13 for ; Tue, 15 Apr 2014 19:44:54 -0700 (PDT) X-Received: by 10.68.129.34 with SMTP id nt2mr5817428pbb.18.1397616294517; Tue, 15 Apr 2014 19:44:54 -0700 (PDT) Received: from alex-shi.Home ([116.232.95.240]) by mx.google.com with ESMTPSA id sv10sm43373627pbc.74.2014.04.15.19.44.48 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Apr 2014 19:44:53 -0700 (PDT) From: Alex Shi To: mingo@redhat.com, peterz@infradead.org, morten.rasmussen@arm.com, vincent.guittot@linaro.org, daniel.lezcano@linaro.org, efault@gmx.de Cc: wangyun@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, mgorman@suse.de Subject: [PATCH V5 8/8] sched: rename update_*_cpu_load Date: Wed, 16 Apr 2014 10:43:29 +0800 Message-Id: <1397616209-27275-9-git-send-email-alex.shi@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397616209-27275-1-git-send-email-alex.shi@linaro.org> References: <1397616209-27275-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.179 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 3b08d7b..1e57983 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -178,7 +178,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 80118b3..8900c8a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2427,7 +2427,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 cad2b6d..864754f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7013,7 +7013,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 f521d8e..f4fb861 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();