[PATCH 03/15] vdso/getrandom: Define fallback __arch_get_vdso_u_rng_data() in getrandom.c
From: Thomas Weißschuh <hidden>
Date: 2026-09-09 08:51:56
Also in:
linux-arch, linux-arm-kernel, linux-mips, linux-riscv, 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_rng_data() is only used in getrandom.c. vsyscall.h has become a dumping ground for different kinds of fallbacks. Move the fallback function definition into getrandom.c, similar to other fallbacks. Signed-off-by: Thomas Weißschuh <redacted> --- include/asm-generic/vdso/vsyscall.h | 7 ------- lib/vdso/getrandom.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 fe12fb1fb442..cdf7b39cd349 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_rng_data -static __always_inline const struct vdso_rng_data *__arch_get_vdso_u_rng_data(void) -{ - return &vdso_u_rng_data; -} -#endif - #ifndef __arch_update_vdso_clock static __always_inline void __arch_update_vdso_clock(struct vdso_clock *vc) {
diff --git a/lib/vdso/getrandom.c b/lib/vdso/getrandom.c
index 2851afa9154f..6ff46549281c 100644
--- a/lib/vdso/getrandom.c
+++ b/lib/vdso/getrandom.c@@ -19,6 +19,13 @@ /* Bring in default accessors */ #include <vdso/vsyscall.h> +#ifndef __arch_get_vdso_u_rng_data +static __always_inline const struct vdso_rng_data *__arch_get_vdso_u_rng_data(void) +{ + return &vdso_u_rng_data; +} +#endif + #define MEMCPY_AND_ZERO_SRC(type, dst, src, len) do { \ while (len >= sizeof(type)) { \ __put_unaligned_t(type, __get_unaligned_t(type, src), dst); \
--
2.55.0