[tip: timers/core] timekeeping: Move the vDSO update declarations into a private header

From: tip-bot2 for Thomas Weißschuh

Date: Tue Jul 07 2026 - 17:49:12 EST


The following commit has been merged into the timers/core branch of tip:

Commit-ID: 79bd39c58f2c6fdbc5fb6300d309606f3cb84ab8
Gitweb: https://git.kernel.org/tip/79bd39c58f2c6fdbc5fb6300d309606f3cb84ab8
Author: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
AuthorDate: Tue, 07 Jul 2026 08:07:15 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxx>
CommitterDate: Tue, 07 Jul 2026 23:48:08 +02:00

timekeeping: Move the vDSO update declarations into a private header

All architectures are now fully using the generic vDSO infrastructure.
They don't need these declarations anymore to implement the functions
in architecture-specific code.

Move them to the private header.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Link: https://patch.msgid.link/20260707-timekeeping-header-cleanup-v1-2-e85ad96409a9@xxxxxxxxxxxxx
---
include/linux/timekeeper_internal.h | 19 -------------------
kernel/time/time.c | 1 +
kernel/time/timekeeping_internal.h | 21 +++++++++++++++++++++
3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index 58c83d6..264db7c 100644
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -190,23 +190,4 @@ struct timekeeper {
s32 tai_offset;
};

-#ifdef CONFIG_GENERIC_GETTIMEOFDAY
-
-extern void update_vsyscall(struct timekeeper *tk);
-extern void update_vsyscall_tz(void);
-extern void vdso_time_update_aux(struct timekeeper *tk);
-
-#else
-
-static inline void update_vsyscall(struct timekeeper *tk)
-{
-}
-static inline void update_vsyscall_tz(void)
-{
-}
-static inline void vdso_time_update_aux(struct timekeeper *tk)
-{
-}
-#endif
-
#endif /* _LINUX_TIMEKEEPER_INTERNAL_H */
diff --git a/kernel/time/time.c b/kernel/time/time.c
index 0dd63a9..d1a7efd 100644
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -42,6 +42,7 @@

#include <generated/timeconst.h>
#include "timekeeping.h"
+#include "timekeeping_internal.h"

/*
* The timezone where the local system is located. Used as a default by some
diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h
index 973ede6..6d719b8 100644
--- a/kernel/time/timekeeping_internal.h
+++ b/kernel/time/timekeeping_internal.h
@@ -6,6 +6,8 @@
#include <linux/spinlock.h>
#include <linux/time.h>

+struct timekeeper;
+
/*
* timekeeping debug functions
*/
@@ -48,4 +50,23 @@ void timekeeper_unlock_irqrestore(unsigned long flags);
/* NTP specific interface to access the current seconds value */
long ktime_get_ntp_seconds(unsigned int id);

+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
+
+extern void update_vsyscall(struct timekeeper *tk);
+extern void update_vsyscall_tz(void);
+extern void vdso_time_update_aux(struct timekeeper *tk);
+
+#else
+
+static inline void update_vsyscall(struct timekeeper *tk)
+{
+}
+static inline void update_vsyscall_tz(void)
+{
+}
+static inline void vdso_time_update_aux(struct timekeeper *tk)
+{
+}
+#endif
+
#endif /* _TIMEKEEPING_INTERNAL_H */