Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd45bb77 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

timers: Invoke timer_start_debug() where it makes sense 



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: 500462a9 ("timers: Switch to a non-cascading wheel")
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Sebastian Siewior <bigeasy@linutronix.de>
Cc: stable@vger.kernel.org
Cc: rt@linutronix.de
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Cc: Anna-Maria Gleixner <anna-maria@linutronix.de>
Link: https://lkml.kernel.org/r/20171222145337.792907137@linutronix.de
parent 5d62c183

kernel/time/timer.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1007,8 +1007,6 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option 
	if (!ret && (options & MOD_TIMER_PENDING_ONLY))

	if (!ret && (options & MOD_TIMER_PENDING_ONLY))

		goto out_unlock;

		goto out_unlock;





	debug_activate(timer, expires);



	new_base = get_target_base(base, timer->flags);

	new_base = get_target_base(base, timer->flags);





	if (base != new_base) {

	if (base != new_base) {
@@ -1032,6 +1030,8 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option 
		}

		}

	}

	}





	debug_activate(timer, expires);



	timer->expires = expires;

	timer->expires = expires;

	/*

	/*

	 * If 'idx' was calculated above and the base time did not advance

	 * If 'idx' was calculated above and the base time did not advance