This is a note to let you know that I've just added the patch titled s390/vdso: rename VDSO64_LBASE to VDSO_LBASE to the 5.13-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: s390-vdso-rename-vdso64_lbase-to-vdso_lbase.patch and it can be found in the queue-5.13 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 43e1f76b0b69b86b2175ef755243e61fe40c75db Mon Sep 17 00:00:00 2001 From: Sven Schnelle <svens@xxxxxxxxxxxxx> Date: Fri, 25 Jun 2021 15:10:35 +0200 Subject: s390/vdso: rename VDSO64_LBASE to VDSO_LBASE From: Sven Schnelle <svens@xxxxxxxxxxxxx> commit 43e1f76b0b69b86b2175ef755243e61fe40c75db upstream. Will be used by both vdso32 and vdso64, so change the name. Signed-off-by: Sven Schnelle <svens@xxxxxxxxxxxxx> Reviewed-by: Heiko Carstens <hca@xxxxxxxxxxxxx> Signed-off-by: Vasily Gorbik <gor@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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) } Patches currently in stable-queue which might be from svens@xxxxxxxxxxxxx are queue-5.13/s390-vdso-rename-vdso64_lbase-to-vdso_lbase.patch queue-5.13/s390-vdso64-add-sigreturn-rt_sigreturn-and-restart_syscall.patch queue-5.13/s390-signal-switch-to-using-vdso-for-sigreturn-and-syscall-restart.patch queue-5.13/s390-vdso-add-minimal-compat-vdso.patch queue-5.13/s390-vdso-always-enable-vdso.patch