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

Commit-ID:     faeff8d416c4c324030d1296a545024c44ddac51
Gitweb:        https://git.kernel.org/tip/faeff8d416c4c324030d1296a545024c44ddac51
Author:        Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate:    Thu, 09 Jul 2026 09:28:40 +02:00
Committer:     Thomas Gleixner <tglx@kernel.org>
CommitterDate: Wed, 15 Jul 2026 10:49:02 +02:00

vdso: Automatically select HAVE_GENERIC_VDSO if necessary

gettimeofday() and getrandom() in the vDSO require the vDSO datastore.

Enable it automatically if either one of them is enabled so the
architecture code doesn't need to know this.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Link: https://patch.msgid.link/20260709-vdso-have_generic_vdso-v1-4-d2e1061f268b@linutronix.de
---
 lib/vdso/Kconfig | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/vdso/Kconfig b/lib/vdso/Kconfig
index db87ba3..eedb049 100644
--- a/lib/vdso/Kconfig
+++ b/lib/vdso/Kconfig
@@ -3,10 +3,9 @@
 config HAVE_GENERIC_VDSO
 	bool
 
-if HAVE_GENERIC_VDSO
-
 config GENERIC_GETTIMEOFDAY
 	bool
+	select HAVE_GENERIC_VDSO
 	help
 	  This is a generic implementation of gettimeofday vdso.
 	  Each architecture that enables this feature has to
@@ -21,7 +20,6 @@ config GENERIC_VDSO_OVERFLOW_PROTECT
 
 config VDSO_GETRANDOM
 	bool
+	select HAVE_GENERIC_VDSO
 	help
 	  Selected by architectures that support vDSO getrandom().
-
-endif