From: Anna-Maria Behnsen Date: Wed, 9 Oct 2024 08:29:04 +0000 (+0200) Subject: timekeeping: Introduce tkd_basic_setup() to make lock and seqcount init reusable X-Git-Tag: v6.13-rc1~171^2~79 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5f9e4e4ef941048d1ff78cbb1ef95b20ed83802;p=thirdparty%2Flinux.git timekeeping: Introduce tkd_basic_setup() to make lock and seqcount init reusable Initialization of lock and seqcount needs to be done for every instance of timekeeper struct. To be able to easily reuse it, create a separate function for it. Signed-off-by: Anna-Maria Behnsen Signed-off-by: Thomas Gleixner Acked-by: John Stultz Link: https://lore.kernel.org/all/20241009-devel-anna-maria-b4-timers-ptp-timekeeping-v2-11-554456a44a15@linutronix.de --- diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index d520c11e912de..cd83deafd3c2f 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1765,6 +1765,12 @@ read_persistent_wall_and_boot_offset(struct timespec64 *wall_time, *boot_offset = ns_to_timespec64(local_clock()); } +static __init void tkd_basic_setup(struct tk_data *tkd) +{ + raw_spin_lock_init(&tkd->lock); + seqcount_raw_spinlock_init(&tkd->seq, &tkd->lock); +} + /* * Flag reflecting whether timekeeping_resume() has injected sleeptime. * @@ -1792,8 +1798,7 @@ void __init timekeeping_init(void) struct timekeeper *tk = &tk_core.timekeeper; struct clocksource *clock; - raw_spin_lock_init(&tk_core.lock); - seqcount_raw_spinlock_init(&tk_core.seq, &tkd->lock); + tkd_basic_setup(&tk_core); read_persistent_wall_and_boot_offset(&wall_time, &boot_offset); if (timespec64_valid_settod(&wall_time) &&