From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933618AbcGGIrZ (ORCPT ); Thu, 7 Jul 2016 04:47:25 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39600 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756962AbcGGIrW (ORCPT ); Thu, 7 Jul 2016 04:47:22 -0400 Date: Thu, 7 Jul 2016 01:46:43 -0700 From: tip-bot for Anna-Maria Gleixner Message-ID: Cc: lenb@kernel.org, anna-maria@linutronix.de, linux-kernel@vger.kernel.org, riel@redhat.com, linux@sciencehorizons.net, edumazet@google.com, arjan@infradead.org, torvalds@linux-foundation.org, tglx@linutronix.de, paulmck@linux.vnet.ibm.com, mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, fweisbec@gmail.com, clm@fb.com, josh@joshtriplett.org Reply-To: lenb@kernel.org, anna-maria@linutronix.de, riel@redhat.com, linux-kernel@vger.kernel.org, linux@sciencehorizons.net, edumazet@google.com, arjan@infradead.org, torvalds@linux-foundation.org, tglx@linutronix.de, paulmck@linux.vnet.ibm.com, peterz@infradead.org, mingo@kernel.org, hpa@zytor.com, clm@fb.com, fweisbec@gmail.com, josh@joshtriplett.org In-Reply-To: <20160704094342.271872665@linutronix.de> References: <20160704094342.271872665@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timers: Move __run_timers() function Git-Commit-ID: 73420fea80c6c376d91a69defe64013baa0d7e95 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: 73420fea80c6c376d91a69defe64013baa0d7e95 Gitweb: http://git.kernel.org/tip/73420fea80c6c376d91a69defe64013baa0d7e95 Author: Anna-Maria Gleixner AuthorDate: Mon, 4 Jul 2016 09:50:33 +0000 Committer: Ingo Molnar CommitDate: Thu, 7 Jul 2016 10:35:09 +0200 timers: Move __run_timers() function Move __run_timers() below __next_timer_interrupt() and next_pending_bucket() in preparation for __run_timers() NOHZ optimization. No functional change. Signed-off-by: Anna-Maria Gleixner Signed-off-by: Thomas Gleixner Cc: Arjan van de Ven Cc: Chris Mason Cc: Eric Dumazet Cc: Frederic Weisbecker Cc: George Spelvin Cc: Josh Triplett Cc: Len Brown Cc: Linus Torvalds Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Rik van Riel Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160704094342.271872665@linutronix.de Signed-off-by: Ingo Molnar --- kernel/time/timer.c | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index a83e23d..c16c48d 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1277,32 +1277,6 @@ static int collect_expired_timers(struct timer_base *base, return levels; } -/** - * __run_timers - run all expired timers (if any) on this CPU. - * @base: the timer vector to be processed. - */ -static inline void __run_timers(struct timer_base *base) -{ - struct hlist_head heads[LVL_DEPTH]; - int levels; - - if (!time_after_eq(jiffies, base->clk)) - return; - - spin_lock_irq(&base->lock); - - while (time_after_eq(jiffies, base->clk)) { - - levels = collect_expired_timers(base, heads); - base->clk++; - - while (levels--) - expire_timers(base, heads + levels); - } - base->running_timer = NULL; - spin_unlock_irq(&base->lock); -} - #ifdef CONFIG_NO_HZ_COMMON /* * Find the next pending bucket of a level. Search from @offset + @clk upwards @@ -1472,6 +1446,32 @@ void update_process_times(int user_tick) run_posix_cpu_timers(p); } +/** + * __run_timers - run all expired timers (if any) on this CPU. + * @base: the timer vector to be processed. + */ +static inline void __run_timers(struct timer_base *base) +{ + struct hlist_head heads[LVL_DEPTH]; + int levels; + + if (!time_after_eq(jiffies, base->clk)) + return; + + spin_lock_irq(&base->lock); + + while (time_after_eq(jiffies, base->clk)) { + + levels = collect_expired_timers(base, heads); + base->clk++; + + while (levels--) + expire_timers(base, heads + levels); + } + base->running_timer = NULL; + spin_unlock_irq(&base->lock); +} + /* * This function runs timers and the timer-tq in bottom half context. */