Merge tag 'powerpc-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-block.git] / arch / powerpc / kexec / elf_64.c

diff --git a/arch/powerpc/kexec/elf_64.c b/arch/powerpc/kexec/elf_64.c
index 6d8951e8e96663d16911140d83d9606deda29efe..214c071c58edf91fcc8cff7547f4943103168847 100644 (file)
--- a/arch/powerpc/kexec/elf_64.c
+++ b/arch/powerpc/kexec/elf_64.c
@@ -116,7 +116,8 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,
        if (ret)
                goto out_free_fdt;
 
-       fdt_pack(fdt);
+       if (!IS_ENABLED(CONFIG_CRASH_HOTPLUG) || image->type != KEXEC_TYPE_CRASH)
+               fdt_pack(fdt);
 
        kbuf.buffer = fdt;
        kbuf.bufsz = kbuf.memsz = fdt_totalsize(fdt);