diff options
| author | Alexander Egorenkov <egorenar@linux.ibm.com> | 2024-04-23 12:42:05 +0300 |
|---|---|---|
| committer | Alexander Gordeev <agordeev@linux.ibm.com> | 2024-04-29 18:33:29 +0300 |
| commit | a2269a66eec37916e2bcc148b7f7ed398b66263f (patch) | |
| tree | 7b447d1fe92fd5bbdfaef9effa8168cba49c561c /arch/s390/kernel/os_info.c | |
| parent | 3113a29e25fe072d6eb0abccd695d7cc72ac9b6f (diff) | |
| download | linux-a2269a66eec37916e2bcc148b7f7ed398b66263f.tar.xz | |
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: f4cac27dc0d6 ("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>
Diffstat (limited to 'arch/s390/kernel/os_info.c')
| -rw-r--r-- | arch/s390/kernel/os_info.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kernel/os_info.c b/arch/s390/kernel/os_info.c index 3f4dc045a894..cb73860c048d 100644 --- a/arch/s390/kernel/os_info.c +++ b/arch/s390/kernel/os_info.c @@ -18,6 +18,7 @@ #include <asm/physmem_info.h> #include <asm/maccess.h> #include <asm/asm-offsets.h> +#include <asm/ipl.h> /* * OS info structure has to be page aligned @@ -146,7 +147,7 @@ static void os_info_old_init(void) if (os_info_init) return; - if (!oldmem_data.start) + if (!oldmem_data.start && !is_ipl_type_dump()) goto fail; if (copy_oldmem_kernel(&addr, __LC_OS_INFO, sizeof(addr))) goto fail; |