From ca0da001d3cfe536ec2cacccd36ce70364cff8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Wed, 9 Sep 2026 10:51:16 +0200 Subject: [PATCH] vdso/getrandom: Define fallback __arch_get_vdso_u_rng_data() in getrandom.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit __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 Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260909-vdso-asm-generic-vsyscall-h-v1-3-63ae856cc659@linutronix.de --- 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 +#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); \