Skip to content

Commit a2269a6

Browse files
eaibmzAlexander Gordeev
authored andcommitted
s390/os_info: Initialize old os_info in standalone dump kernel
The commit be42660d0c13 ("s390/crash: use old os_info to create PT_LOAD headers") introduced use of the old os_info into standalone dump kernel. Before this change os_info_old_init() expected to be called only from a regular kdump kernel although the function itself is able to work in standalone dump kernels as well (because copy_oldmem_kernel() is able to handle both use cases). Therefore, fix the expectation of os_info_old_init() and enable it to be called from a standalone dump kernel. Fixes: f4cac27 ("s390/crash: Use old os_info to create PT_LOAD headers") Acked-by: Alexander Gordeev <agordeev@linux.ibm.com> Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
1 parent 3113a29 commit a2269a6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/s390/kernel/os_info.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <asm/physmem_info.h>
1919
#include <asm/maccess.h>
2020
#include <asm/asm-offsets.h>
21+
#include <asm/ipl.h>
2122

2223
/*
2324
* OS info structure has to be page aligned
@@ -146,7 +147,7 @@ static void os_info_old_init(void)
146147

147148
if (os_info_init)
148149
return;
149-
if (!oldmem_data.start)
150+
if (!oldmem_data.start && !is_ipl_type_dump())
150151
goto fail;
151152
if (copy_oldmem_kernel(&addr, __LC_OS_INFO, sizeof(addr)))
152153
goto fail;

0 commit comments

Comments
 (0)