summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2023-02-02 21:22:35 +0300
committerHeiko Carstens <hca@linux.ibm.com>2023-02-06 13:13:55 +0300
commit6bddf115d0baed3095339024d942d7d1b5e7e4d6 (patch)
tree04fd18dbf5674bae6220d511af003824d6009214 /arch
parentd1725ca60e8ff7aef3573d29231251c2838ca532 (diff)
downloadlinux-6bddf115d0baed3095339024d942d7d1b5e7e4d6.tar.xz
s390/boot: avoid potential amode31 truncation
Fixes: bb1520d581a3 ("s390/mm: start kernel with DAT enabled") Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/boot/startup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c
index e7e2de386e24..f5a7545d3c13 100644
--- a/arch/s390/boot/startup.c
+++ b/arch/s390/boot/startup.c
@@ -271,7 +271,7 @@ static void offset_vmlinux_info(unsigned long offset)
static unsigned long reserve_amode31(unsigned long safe_addr)
{
__amode31_base = PAGE_ALIGN(safe_addr);
- return safe_addr + vmlinux.amode31_size;
+ return __amode31_base + vmlinux.amode31_size;
}
void startup_kernel(void)