Commit 98333a84 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Thomas Gleixner
Browse files

s390/vdso: Drop LBASE_VDSO 



This constant is always "0", providing no value and making the logic
harder to understand.
Also prepare for a consolidation of the vdso linkerscript logic by
aligning it with other architectures.

Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Link: https://lore.kernel.org/all/20241010-vdso-generic-base-v1-3-b64f0842d512@linutronix.de
parent ff435493

arch/s390/include/asm/vdso.h

+0 −3
Original line number Diff line number Diff line
@@ -12,9 +12,6 @@ int vdso_getcpu_init(void); 


#endif /* __ASSEMBLY__ */



/* Default link address for the vDSO */

#define VDSO_LBASE	0



#define __VVAR_PAGES	2



#define VDSO_VERSION_STRING	LINUX_2.6.29

arch/s390/kernel/vdso32/vdso32.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ SECTIONS 
#ifdef CONFIG_TIME_NS

	PROVIDE(_timens_data = _vdso_data + PAGE_SIZE);

#endif

	. = VDSO_LBASE + SIZEOF_HEADERS;

	. = SIZEOF_HEADERS;



	.hash		: { *(.hash) }			:text

	.gnu.hash	: { *(.gnu.hash) }

arch/s390/kernel/vdso64/vdso64.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ SECTIONS 
#ifdef CONFIG_TIME_NS

	PROVIDE(_timens_data = _vdso_data + PAGE_SIZE);

#endif

	. = VDSO_LBASE + SIZEOF_HEADERS;

	. = SIZEOF_HEADERS;



	.hash		: { *(.hash) }			:text

	.gnu.hash	: { *(.gnu.hash) }