| From e1ed60484029a63e1d9515efb15dd043f8d6b196 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 5 Aug 2025 10:41:33 +0200 |
| Subject: s390/boot: Fix startup debugging log |
| |
| From: Mikhail Zaslonko <zaslonko@linux.ibm.com> |
| |
| [ 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c |
| index 06316fb8e0fa..6d4357441897 100644 |
| --- a/arch/s390/boot/startup.c |
| +++ b/arch/s390/boot/startup.c |
| @@ -369,7 +369,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, |
| -- |
| 2.39.5 |
| |
