From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20171222145337.792907137@linutronix.de> Date: Fri, 22 Dec 2017 15:51:14 +0100 From: Thomas Gleixner To: LKML Cc: Anna-Maria Gleixner , Sebastian Siewior , Paul McKenney , Peter Zijlstra , Frederic Weisbecker , Ingo Molnar , stable@vger.kernel.org, rt@linutronix.de Subject: [patch 3/4] timer: Invoke timer_start_debug() where it makes sense References: <20171222145111.919609918@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=timer--Invoke_timer_start_debug--_where_it_makes_sense.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: From: Thomas Gleixner The timer start debug function is called before the proper timer base is set. As a consequence the trace data contains the stale CPU and flags values. Call the debug function after setting the new base and flags. Fixes: 500462a9de65 ("timers: Switch to a non-cascading wheel") Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Cc: rt@linutronix.de --- kernel/time/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1007,8 +1007,6 @@ static inline int if (!ret && (options & MOD_TIMER_PENDING_ONLY)) goto out_unlock; - debug_activate(timer, expires); - new_base = get_target_base(base, timer->flags); if (base != new_base) { @@ -1032,6 +1030,8 @@ static inline int } } + debug_activate(timer, expires); + timer->expires = expires; /* * If 'idx' was calculated above and the base time did not advance