diff options
| author |  Hari Bathini <hbathini@linux.ibm.com>
| 2024-02-26 16:00:09 +0530 |
|---|---|---|
| committer |  Michael Ellerman <mpe@ellerman.id.au>
| 2024-03-17 13:34:00 +1100 |
| commit | 33f2cc0a2e90f7177c49559b434191b02efd0cd5 (patch) | |
| tree | 2091e7dc97123f19e26f0c0ea3bc2dcef713bfc1 /arch/powerpc/kexec/elf_64.c | |
| parent | kexec/kdump: make struct crash_mem available without CONFIG_CRASH_DUMP (diff) | |
| download | linux-33f2cc0a2e90f7177c49559b434191b02efd0cd5.tar.gz linux-33f2cc0a2e90f7177c49559b434191b02efd0cd5.tar.bz2 linux-33f2cc0a2e90f7177c49559b434191b02efd0cd5.zip | |
powerpc/kexec: split CONFIG_KEXEC_FILE and CONFIG_CRASH_DUMP
CONFIG_KEXEC_FILE does not have to select CONFIG_CRASH_DUMP. Move
some code under CONFIG_CRASH_DUMP to support CONFIG_KEXEC_FILE and
!CONFIG_CRASH_DUMP case.
Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240226103010.589537-3-hbathini@linux.ibm.com
Diffstat (limited to 'arch/powerpc/kexec/elf_64.c')
| -rw-r--r-- | arch/powerpc/kexec/elf_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kexec/elf_64.c b/arch/powerpc/kexec/elf_64.c index 904016cf89ea..6d8951e8e966 100644 --- a/arch/powerpc/kexec/elf_64.c +++ b/arch/powerpc/kexec/elf_64.c @@ -47,7 +47,7 @@ static void *elf64_load(struct kimage *image, char *kernel_buf, if (ret) return ERR_PTR(ret); - if (image->type == KEXEC_TYPE_CRASH) { + if (IS_ENABLED(CONFIG_CRASH_DUMP) && image->type == KEXEC_TYPE_CRASH) { /* min & max buffer values for kdump case */ kbuf.buf_min = pbuf.buf_min = crashk_res.start; kbuf.buf_max = pbuf.buf_max = @@ -70,7 +70,7 @@ static void *elf64_load(struct kimage *image, char *kernel_buf, kexec_dprintk("Loaded purgatory at 0x%lx\n", pbuf.mem); /* Load additional segments needed for panic kernel */ - if (image->type == KEXEC_TYPE_CRASH) { + if (IS_ENABLED(CONFIG_CRASH_DUMP) && image->type == KEXEC_TYPE_CRASH) { ret = load_crashdump_segments_ppc64(image, &kbuf); if (ret) { pr_err("Failed to load kdump kernel segments\n"); |