[PATCH 07/15] sparc/vdso: Move __VDSO_PAGES to asm/vdso.h
From: Thomas Weißschuh <hidden>
Date: 2026-09-09 08:52:11
Also in:
linux-arch, linux-arm-kernel, linux-mips, linux-riscv, linux-s390, lkml, loongarch, sparclinux
Subsystem:
sparc + ultrasparc (sparc/sparc64), the rest · Maintainers:
"David S. Miller", Andreas Larsson, Linus Torvalds
Most architectures define the __VDSO_PAGES page macro in asm/vdso.h. Align the SPARC headers. Signed-off-by: Thomas Weißschuh <redacted> --- arch/sparc/include/asm/vdso.h | 6 ++++++ arch/sparc/include/asm/vdso/vsyscall.h | 2 -- arch/sparc/vdso/vdso-layout.lds.S | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/sparc/include/asm/vdso.h b/arch/sparc/include/asm/vdso.h
index f08562d10215..b17c37c8075b 100644
--- a/arch/sparc/include/asm/vdso.h
+++ b/arch/sparc/include/asm/vdso.h@@ -5,6 +5,10 @@ #ifndef _ASM_SPARC_VDSO_H #define _ASM_SPARC_VDSO_H +#define __VDSO_PAGES 4 + +#ifndef __ASSEMBLER__ + struct vdso_image { void *data; unsigned long size; /* Always a multiple of PAGE_SIZE */
@@ -17,4 +21,6 @@ extern const struct vdso_image vdso_image_64_builtin; extern const struct vdso_image vdso_image_32_builtin; #endif +#endif /* __ASSEMBLER__ */ + #endif /* _ASM_SPARC_VDSO_H */
diff --git a/arch/sparc/include/asm/vdso/vsyscall.h b/arch/sparc/include/asm/vdso/vsyscall.h
index b08e0bd5e309..ff62b291e4eb 100644
--- a/arch/sparc/include/asm/vdso/vsyscall.h
+++ b/arch/sparc/include/asm/vdso/vsyscall.h@@ -3,6 +3,4 @@ #ifndef _ASM_SPARC_VDSO_VSYSCALL_H #define _ASM_SPARC_VDSO_VSYSCALL_H -#define __VDSO_PAGES 4 - #endif /* _ASM_SPARC_VDSO_VSYSCALL_H */
diff --git a/arch/sparc/vdso/vdso-layout.lds.S b/arch/sparc/vdso/vdso-layout.lds.S
index 180e5d0ee071..920396203a2e 100644
--- a/arch/sparc/vdso/vdso-layout.lds.S
+++ b/arch/sparc/vdso/vdso-layout.lds.S@@ -6,7 +6,7 @@ #include <vdso/datapage.h> #include <vdso/page.h> -#include <asm/vdso/vsyscall.h> +#include <asm/vdso.h> SECTIONS {
--
2.55.0