The following commit has been merged into the timers/vdso branch of tip: Commit-ID: 998a8a2608199fc07c3a49200c73708e9df01e0f Gitweb: https://git.kernel.org/tip/998a8a2608199fc07c3a49200c73708e9df01e0f Author: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx> AuthorDate: Tue, 04 Feb 2025 13:05:49 +01:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Fri, 21 Feb 2025 09:54:03 +01:00 vdso: Remove remnants of architecture-specific random state storage All users of the random vDSO are using the generic storage implementation. Remove the now unnecessary compatibility accessor functions and symbols. Co-developed-by: Nam Cao <namcao@xxxxxxxxxxxxx> Signed-off-by: Nam Cao <namcao@xxxxxxxxxxxxx> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/all/20250204-vdso-store-rng-v3-17-13a4669dfc8c@xxxxxxxxxxxxx --- include/asm-generic/vdso/vsyscall.h | 5 ----- include/vdso/datapage.h | 1 - 2 files changed, 6 deletions(-) diff --git a/include/asm-generic/vdso/vsyscall.h b/include/asm-generic/vdso/vsyscall.h index a5f973e..13e2ac3 100644 --- a/include/asm-generic/vdso/vsyscall.h +++ b/include/asm-generic/vdso/vsyscall.h @@ -32,11 +32,6 @@ static __always_inline struct vdso_data *__arch_get_k_vdso_data(void) #define __arch_get_vdso_u_time_data __arch_get_vdso_data -#ifndef __arch_get_vdso_u_rng_data -#define __arch_get_vdso_u_rng_data() __arch_get_vdso_rng_data() -#endif -#define vdso_k_rng_data __arch_get_k_vdso_rng_data() - #endif /* CONFIG_GENERIC_VDSO_DATA_STORE */ #ifndef __arch_update_vsyscall diff --git a/include/vdso/datapage.h b/include/vdso/datapage.h index 46658b3..497907c 100644 --- a/include/vdso/datapage.h +++ b/include/vdso/datapage.h @@ -152,7 +152,6 @@ struct vdso_rng_data { #ifndef CONFIG_GENERIC_VDSO_DATA_STORE extern struct vdso_time_data _vdso_data[CS_BASES] __attribute__((visibility("hidden"))); extern struct vdso_time_data _timens_data[CS_BASES] __attribute__((visibility("hidden"))); -extern struct vdso_rng_data _vdso_rng_data __attribute__((visibility("hidden"))); #else extern struct vdso_time_data vdso_u_time_data[CS_BASES] __attribute__((visibility("hidden"))); extern struct vdso_rng_data vdso_u_rng_data __attribute__((visibility("hidden")));
![]() |