[PATCH 02/15] vdso/gettimeofday: Define fallback __arch_get_vdso_u_time_data() in gettimeofday.c
From: Thomas Weißschuh <hidden>
Date: 2026-09-09 08:51:42
Also in:
linux-arch, linux-arm-kernel, linux-riscv, linux-s390, linuxppc-dev, lkml, loongarch, sparclinux
Subsystem:
generic include/asm header files, generic vdso library, library code, the rest · Maintainers:
Arnd Bergmann, Andy Lutomirski, Thomas Gleixner, Vincenzo Frascino, Andrew Morton, Linus Torvalds
__arch_get_vdso_u_time_data() is only used in gettimeofday.c. vsyscall.h has become a dumping ground for different kinds of fallbacks. Move the fallback function definition into gettimeofday.c, similar to other fallbacks. Signed-off-by: Thomas Weißschuh <redacted> --- include/asm-generic/vdso/vsyscall.h | 7 ------- lib/vdso/gettimeofday.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/asm-generic/vdso/vsyscall.h b/include/asm-generic/vdso/vsyscall.h
index a6b03cfba0e2..fe12fb1fb442 100644
--- a/include/asm-generic/vdso/vsyscall.h
+++ b/include/asm-generic/vdso/vsyscall.h@@ -4,13 +4,6 @@ #ifndef __ASSEMBLER__ -#ifndef __arch_get_vdso_u_time_data -static __always_inline const struct vdso_time_data *__arch_get_vdso_u_time_data(void) -{ - return &vdso_u_time_data; -} -#endif - #ifndef __arch_get_vdso_u_rng_data static __always_inline const struct vdso_rng_data *__arch_get_vdso_u_rng_data(void) {
diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
index f7a591aba59f..b867c2301d5c 100644
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c@@ -93,6 +93,13 @@ static inline bool vdso_cycles_ok(u64 cycles) } #endif +#ifndef __arch_get_vdso_u_time_data +static __always_inline const struct vdso_time_data *__arch_get_vdso_u_time_data(void) +{ + return &vdso_u_time_data; +} +#endif + static __always_inline bool vdso_clockid_valid(clockid_t clock) { /* Check for negative values or invalid clocks */
--
2.55.0