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

Commit-ID:     551f209164c4d2cb8d5542351f145e8257c44702
Gitweb:        https://git.kernel.org/tip/551f209164c4d2cb8d5542351f145e8257c44702
Author:        Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate:    Thu, 21 May 2026 08:53:16 +02:00
Committer:     Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 04 Jun 2026 18:22:45 +02:00

vdso/datastore: Always provide symbol declarations

Allow callers to easily reference these symbols in code that is built
even when the generic datastore is disabled.

As there are no good default no-op variants of these symbols, do not
provide stubs but require users to have their own fallback handling
using IS_ENABLED(CONFIG_HAVE_GENERIC_VDSO).

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-2-2f79dcd6c78f@linutronix.de
---
 include/linux/vdso_datastore.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/vdso_datastore.h b/include/linux/vdso_datastore.h
index 0b53042..3dfba95 100644
--- a/include/linux/vdso_datastore.h
+++ b/include/linux/vdso_datastore.h
@@ -2,12 +2,12 @@
 #ifndef _LINUX_VDSO_DATASTORE_H
 #define _LINUX_VDSO_DATASTORE_H
 
-#ifdef CONFIG_HAVE_GENERIC_VDSO
 #include <linux/mm_types.h>
 
 extern const struct vm_special_mapping vdso_vvar_mapping;
 struct vm_area_struct *vdso_install_vvar_mapping(struct mm_struct *mm, unsigned long addr);
 
+#ifdef CONFIG_HAVE_GENERIC_VDSO
 void __init vdso_setup_data_pages(void);
 #else /* !CONFIG_HAVE_GENERIC_VDSO */
 static inline void vdso_setup_data_pages(void) { }