Skip to content

Commit 98333a8

Browse files
t-8chKAGA-KOKO
authored andcommitted
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: Thomas Weißschuh <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Heiko Carstens <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent ff43549 commit 98333a8

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

arch/s390/include/asm/vdso.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ int vdso_getcpu_init(void);
1212

1313
#endif /* __ASSEMBLY__ */
1414

15-
/* Default link address for the vDSO */
16-
#define VDSO_LBASE 0
17-
1815
#define __VVAR_PAGES 2
1916

2017
#define VDSO_VERSION_STRING LINUX_2.6.29

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SECTIONS
1616
#ifdef CONFIG_TIME_NS
1717
PROVIDE(_timens_data = _vdso_data + PAGE_SIZE);
1818
#endif
19-
. = VDSO_LBASE + SIZEOF_HEADERS;
19+
. = SIZEOF_HEADERS;
2020

2121
.hash : { *(.hash) } :text
2222
.gnu.hash : { *(.gnu.hash) }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SECTIONS
1818
#ifdef CONFIG_TIME_NS
1919
PROVIDE(_timens_data = _vdso_data + PAGE_SIZE);
2020
#endif
21-
. = VDSO_LBASE + SIZEOF_HEADERS;
21+
. = SIZEOF_HEADERS;
2222

2323
.hash : { *(.hash) } :text
2424
.gnu.hash : { *(.gnu.hash) }

0 commit comments

Comments
 (0)