[PATCH 3/4] s390/vdso: Trim includes in linker script

Thomas Weißschuh posted 4 patches 3 weeks, 3 days ago
[PATCH 3/4] s390/vdso: Trim includes in linker script
Posted by Thomas Weißschuh 3 weeks, 3 days ago
Some of the included files are unnecessary or too broad.

This is a preparation for a new validation step to validate the
consistency of __BITS_PER_LONG. vdso.lds.S may be preprocessed with a
32-bit compiler, but __BITS_PER_LONG is always 64.

Trim the includes to the necessary ones.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>

---
There are other ways to solve this issue, for example using
KBUILD_CPPFLAGS += -m64.
---
 arch/s390/kernel/vdso/vdso.lds.S | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/s390/kernel/vdso/vdso.lds.S b/arch/s390/kernel/vdso/vdso.lds.S
index 7bec4de0e8e0..c8abd00799be 100644
--- a/arch/s390/kernel/vdso/vdso.lds.S
+++ b/arch/s390/kernel/vdso/vdso.lds.S
@@ -4,11 +4,10 @@
  * library
  */
 
-#include <asm/vdso/vsyscall.h>
-#include <asm/page.h>
 #include <asm/vdso.h>
 #include <asm-generic/vmlinux.lds.h>
 #include <vdso/datapage.h>
+#include <vdso/page.h>
 
 OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390")
 OUTPUT_ARCH(s390:64-bit)

-- 
2.52.0

Re: [PATCH 3/4] s390/vdso: Trim includes in linker script
Posted by Heiko Carstens 3 weeks, 1 day ago
On Fri, Jan 16, 2026 at 08:40:26AM +0100, Thomas Weißschuh wrote:
> Some of the included files are unnecessary or too broad.
> 
> This is a preparation for a new validation step to validate the
> consistency of __BITS_PER_LONG. vdso.lds.S may be preprocessed with a
> 32-bit compiler, but __BITS_PER_LONG is always 64.
> 
> Trim the includes to the necessary ones.
> 
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> ---
>  arch/s390/kernel/vdso/vdso.lds.S | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Acked-by: Heiko Carstens <hca@linux.ibm.com>