Commit 0973fed6 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Thomas Gleixner
Browse files

arm64: 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 avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/all/20241010-vdso-generic-base-v1-4-b64f0842d512@linutronix.de
parent 98333a84

arch/arm64/include/asm/vdso.h

+1 −8
Original line number Diff line number Diff line
@@ -5,13 +5,6 @@ 
#ifndef __ASM_VDSO_H

#define __ASM_VDSO_H



/*

 * Default link address for the vDSO.

 * Since we randomise the VDSO mapping, there's little point in trying

 * to prelink this.

 */

#define VDSO_LBASE	0x0



#define __VVAR_PAGES    2



#ifndef __ASSEMBLY__
@@ -20,7 +13,7 @@ 


#define VDSO_SYMBOL(base, name)						   \

({									   \

	(void *)(vdso_offset_##name - VDSO_LBASE + (unsigned long)(base)); \

	(void *)(vdso_offset_##name + (unsigned long)(base)); \

})



extern char vdso_start[], vdso_end[];

arch/arm64/kernel/vdso/vdso.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,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/arm64/kernel/vdso32/vdso.lds.S

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

	PROVIDE_HIDDEN(_timens_data = _vdso_data + PAGE_SIZE);

#endif

	. = VDSO_LBASE + SIZEOF_HEADERS;

	. = SIZEOF_HEADERS;



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

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