[tip: timers/core] timekeeping/auxclock: Consistently use raw timekeeper for tk_setup_internals()
From: tip-bot2 for Thomas Weißschuh (Schneider Electric)
Date: Thu Mar 12 2026 - 07:34:07 EST
The following commit has been merged into the timers/core branch of tip:
Commit-ID: ba546d3d895c5190a4c16d92e1ecff7c0b4ee9b3
Gitweb: https://git.kernel.org/tip/ba546d3d895c5190a4c16d92e1ecff7c0b4ee9b3
Author: Thomas Weißschuh (Schneider Electric) <thomas.weissschuh@xxxxxxxxxxxxx>
AuthorDate: Wed, 11 Mar 2026 11:15:13 +01:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxx>
CommitterDate: Thu, 12 Mar 2026 12:15:54 +01:00
timekeeping/auxclock: Consistently use raw timekeeper for tk_setup_internals()
In aux_clock_enable() the clocksource from tkr_raw is used to call
tk_setup_internals(). Do the same in tk_aux_update_clocksource(). While
the clocksources will be the same in any case, this is less confusing.
Signed-off-by: Thomas Weißschuh (Schneider Electric) <thomas.weissschuh@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Link: https://patch.msgid.link/20260311-hrtimer-cleanups-v1-4-095357392669@xxxxxxxxxxxxx
---
kernel/time/timekeeping.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 5153218..46b77c3 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -2985,7 +2985,7 @@ static void tk_aux_update_clocksource(void)
continue;
timekeeping_forward_now(tks);
- tk_setup_internals(tks, tk_core.timekeeper.tkr_mono.clock);
+ tk_setup_internals(tks, tk_core.timekeeper.tkr_raw.clock);
timekeeping_update_from_shadow(tkd, TK_UPDATE_ALL);
}
}