From: Thomas Gleixner tglx@linutronix.de

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 tglx@linutronix.de Cc: stable@vger.kernel.org Cc: rt@linutronix.de Signed-off-by: Sebastian Andrzej Siewior bigeasy@linutronix.de --- kernel/time/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/timer.c b/kernel/time/timer.c index a8246d79cb5a..6b322aea1c46 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -838,8 +838,6 @@ __mod_timer(struct timer_list *timer, unsigned long expires, if (!ret && pending_only) goto out_unlock;

- debug_activate(timer, expires); - new_base = get_target_base(base, pinned);

if (base != new_base) { @@ -854,6 +852,8 @@ __mod_timer(struct timer_list *timer, unsigned long expires, base = switch_timer_base(timer, base, new_base); }

+ debug_activate(timer, expires); + timer->expires = expires; internal_add_timer(base, timer);