]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
s390/boot: Fix startup debugging log
authorMikhail Zaslonko <zaslonko@linux.ibm.com>
Tue, 5 Aug 2025 08:41:33 +0000 (10:41 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Aug 2025 14:39:28 +0000 (16:39 +0200)
[ Upstream commit e29409faec87ffd2de2ed20b6109f303f129281b ]

Fix 'kernel image' end address for kaslr case.

Fixes: ec6f9f7e5bbf ("s390/boot: Add startup debugging support")
Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/s390/boot/startup.c

index da8337e63a3e234108ac00e4eea639d28ba3f4fd..e124d1f1cf760ae35e4e687ba94d5e5b70bec5e6 100644 (file)
@@ -384,7 +384,7 @@ static unsigned long setup_kernel_memory_layout(unsigned long kernel_size)
                kernel_start = round_down(kernel_end - kernel_size, THREAD_SIZE);
                boot_debug("Randomization range: 0x%016lx-0x%016lx\n", vmax - kaslr_len, vmax);
                boot_debug("kernel image:        0x%016lx-0x%016lx (kaslr)\n", kernel_start,
-                          kernel_size + kernel_size);
+                          kernel_start + kernel_size);
        } else if (vmax < __NO_KASLR_END_KERNEL || vsize > __NO_KASLR_END_KERNEL) {
                kernel_start = round_down(vmax - kernel_size, THREAD_SIZE);
                boot_debug("kernel image:        0x%016lx-0x%016lx (constrained)\n", kernel_start,