From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754648Ab1HOPwu (ORCPT ); Mon, 15 Aug 2011 11:52:50 -0400 Received: from mail-vw0-f46.google.com ([209.85.212.46]:38331 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754615Ab1HOPwq (ORCPT ); Mon, 15 Aug 2011 11:52:46 -0400 From: Frederic Weisbecker To: LKML Cc: Frederic Weisbecker , Andrew Morton , Anton Blanchard , Avi Kivity , Ingo Molnar , Lai Jiangshan , "Paul E . McKenney" , Paul Menage , Peter Zijlstra , Stephen Hemminger , Thomas Gleixner , Tim Pepper Subject: [PATCH 02/32 RESEND] nohz: Drop ts->idle_active Date: Mon, 15 Aug 2011 17:51:59 +0200 Message-Id: <1313423549-27093-3-git-send-email-fweisbec@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1313423549-27093-1-git-send-email-fweisbec@gmail.com> References: <1313423549-27093-1-git-send-email-fweisbec@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ts->idle_active is used to know if we want to account the idle sleep time. But ts->inidle is enough to check that. So drop that field and use inidle instead. This simplifies the code. Signed-off-by: Frederic Weisbecker Cc: Andrew Morton Cc: Anton Blanchard Cc: Avi Kivity Cc: Ingo Molnar Cc: Lai Jiangshan Cc: Paul E . McKenney Cc: Paul Menage Cc: Peter Zijlstra Cc: Stephen Hemminger Cc: Thomas Gleixner Cc: Tim Pepper --- include/linux/tick.h | 1 - kernel/time/tick-sched.c | 14 ++++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/include/linux/tick.h b/include/linux/tick.h index b232ccc..532e650 100644 --- a/include/linux/tick.h +++ b/include/linux/tick.h @@ -56,7 +56,6 @@ struct tick_sched { unsigned long idle_jiffies; unsigned long idle_calls; unsigned long idle_sleeps; - int idle_active; ktime_t idle_entrytime; ktime_t idle_waketime; ktime_t idle_exittime; diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 58e1a96..c4d7113 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -157,7 +157,7 @@ update_ts_time_stats(int cpu, struct tick_sched *ts, ktime_t now, u64 *last_upda { ktime_t delta; - if (ts->idle_active) { + if (ts->inidle) { delta = ktime_sub(now, ts->idle_entrytime); ts->idle_sleeptime = ktime_add(ts->idle_sleeptime, delta); if (nr_iowait_cpu(cpu) > 0) @@ -175,7 +175,6 @@ static void tick_nohz_stop_idle(int cpu, ktime_t now) struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu); update_ts_time_stats(cpu, ts, now, NULL); - ts->idle_active = 0; sched_clock_idle_wakeup_event(0); } @@ -186,7 +185,6 @@ static ktime_t tick_nohz_start_idle(int cpu, struct tick_sched *ts) now = ktime_get(); ts->idle_entrytime = now; - ts->idle_active = 1; sched_clock_idle_sleep_event(); return now; } @@ -502,11 +500,11 @@ void tick_nohz_restart_sched_tick(void) ktime_t now; local_irq_disable(); - if (ts->idle_active || (ts->inidle && ts->tick_stopped)) - now = ktime_get(); - if (ts->idle_active) + if (ts->inidle) { + now = ktime_get(); tick_nohz_stop_idle(cpu, now); + } if (!ts->inidle || !ts->tick_stopped) { ts->inidle = 0; @@ -677,10 +675,10 @@ static inline void tick_check_nohz(int cpu) struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu); ktime_t now; - if (!ts->idle_active && !ts->tick_stopped) + if (!ts->inidle && !ts->tick_stopped) return; now = ktime_get(); - if (ts->idle_active) + if (ts->inidle) tick_nohz_stop_idle(cpu, now); if (ts->tick_stopped) { tick_nohz_update_jiffies(now); -- 1.7.5.4