Commit 7a39a508 authored by Anna-Maria Behnsen's avatar Anna-Maria Behnsen Committed by Thomas Gleixner
Browse files

timers: Use already existing function for forwarding timer base 



There is an already existing function for forwarding the timer
base. Forwarding the timer base is implemented directly in
get_next_timer_interrupt() as well.

Remove the code duplication and invoke __forward_timer_base() instead.

Signed-off-by: default avatarAnna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20231201092654.34614-11-anna-maria@linutronix.de
parent 1e490484

kernel/time/timer.c

+2 −8
Original line number Diff line number Diff line
@@ -1939,15 +1939,9 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) 


	/*

	 * We have a fresh next event. Check whether we can forward the

	 * base. We can only do that when @basej is past base->clk

	 * otherwise we might rewind base->clk.

	 * base.

	 */

	if (time_after(basej, base->clk)) {

		if (time_after(nextevt, basej))

			base->clk = basej;

		else if (time_after(nextevt, base->clk))

			base->clk = nextevt;

	}

	__forward_timer_base(base, basej);



	if (time_before_eq(nextevt, basej)) {

		expires = basem;