[tip: timers/core] timekeeping: Fold vdso_time_update_aux() declarations into the generic ifdeffery

[tip-bot2 for Thomas Weißschuh]

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

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

timekeeping: Fold vdso_time_update_aux() declarations into the generic ifdeffery

The only caller of vdso_time_update_aux() is already gated behind
CONFIG_POSIX_AUX. The additional check in the header files is not
necessary.

Remove it and then fold the declarations into the existing
CONFIG_GENERIC_GETTIMEOFDAY ifdeffery.

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-1-e85ad96409a9@xxxxxxxxxxxxx
---
 include/linux/timekeeper_internal.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index 4486dfd..58c83d6 100644
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -194,6 +194,7 @@ struct timekeeper {
 
 extern void update_vsyscall(struct timekeeper *tk);
 extern void update_vsyscall_tz(void);
+extern void vdso_time_update_aux(struct timekeeper *tk);
 
 #else
 
@@ -203,12 +204,9 @@ static inline void update_vsyscall(struct timekeeper *tk)
 static inline void update_vsyscall_tz(void)
 {
 }
-#endif
-
-#if defined(CONFIG_GENERIC_GETTIMEOFDAY) && defined(CONFIG_POSIX_AUX_CLOCKS)
-extern void vdso_time_update_aux(struct timekeeper *tk);
-#else
-static inline void vdso_time_update_aux(struct timekeeper *tk) { }
+static inline void vdso_time_update_aux(struct timekeeper *tk)
+{
+}
 #endif
 
 #endif /* _LINUX_TIMEKEEPER_INTERNAL_H */