[PATCH 5.12 232/242] s390/vdso: rename VDSO64_LBASE to VDSO_LBASE

Greg Kroah-Hartman
2021-07-15T19:20:35Z

From: Sven Schnelle <svens@linux.ibm.com>

commit 43e1f76b0b69b86b2175ef755243e61fe40c75db upstream.

Will be used by both vdso32 and vdso64, so change the name.

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/s390/include/asm/vdso.h | 2 +-
arch/s390/kernel/vdso64/vdso64.lds.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

--- a/arch/s390/include/asm/vdso.h
+++ b/arch/s390/include/asm/vdso.h
@@ -5,7 +5,7 @@
#include <vdso/datapage.h>

/* Default link address for the vDSO */
-#define VDSO64_LBASE 0
+#define VDSO_LBASE 0

#define __VVAR_PAGES 2

--- a/arch/s390/kernel/vdso64/vdso64.lds.S
+++ b/arch/s390/kernel/vdso64/vdso64.lds.S
@@ -17,7 +17,7 @@ SECTIONS
#ifdef CONFIG_TIME_NS
PROVIDE(_timens_data = _vdso_data + PAGE_SIZE);
#endif
- . = VDSO64_LBASE + SIZEOF_HEADERS;
+ . = VDSO_LBASE + SIZEOF_HEADERS;

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