aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kernel/kexec_elf_64.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/kexec_elf_64.c b/arch/powerpc/kernel/kexec_elf_64.c
index ba4f18a43ee8..52a29fc73730 100644
--- a/arch/powerpc/kernel/kexec_elf_64.c
+++ b/arch/powerpc/kernel/kexec_elf_64.c
@@ -547,6 +547,7 @@ static int elf_exec_load(struct kimage *image, struct elfhdr *ehdr,
547 kbuf.memsz = phdr->p_memsz; 547 kbuf.memsz = phdr->p_memsz;
548 kbuf.buf_align = phdr->p_align; 548 kbuf.buf_align = phdr->p_align;
549 kbuf.buf_min = phdr->p_paddr + base; 549 kbuf.buf_min = phdr->p_paddr + base;
550 kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
550 ret = kexec_add_buffer(&kbuf); 551 ret = kexec_add_buffer(&kbuf);
551 if (ret) 552 if (ret)
552 goto out; 553 goto out;
@@ -581,7 +582,8 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,
581 struct kexec_buf kbuf = { .image = image, .buf_min = 0, 582 struct kexec_buf kbuf = { .image = image, .buf_min = 0,
582 .buf_max = ppc64_rma_size }; 583 .buf_max = ppc64_rma_size };
583 struct kexec_buf pbuf = { .image = image, .buf_min = 0, 584 struct kexec_buf pbuf = { .image = image, .buf_min = 0,
584 .buf_max = ppc64_rma_size, .top_down = true }; 585 .buf_max = ppc64_rma_size, .top_down = true,
586 .mem = KEXEC_BUF_MEM_UNKNOWN };
585 587
586 ret = build_elf_exec_info(kernel_buf, kernel_len, &ehdr, &elf_info); 588 ret = build_elf_exec_info(kernel_buf, kernel_len, &ehdr, &elf_info);
587 if (ret) 589 if (ret)
@@ -606,6 +608,7 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,
606 kbuf.bufsz = kbuf.memsz = initrd_len; 608 kbuf.bufsz = kbuf.memsz = initrd_len;
607 kbuf.buf_align = PAGE_SIZE; 609 kbuf.buf_align = PAGE_SIZE;
608 kbuf.top_down = false; 610 kbuf.top_down = false;
611 kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
609 ret = kexec_add_buffer(&kbuf); 612 ret = kexec_add_buffer(&kbuf);
610 if (ret) 613 if (ret)
611 goto out; 614 goto out;
@@ -638,6 +641,7 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,
638 kbuf.bufsz = kbuf.memsz = fdt_size; 641 kbuf.bufsz = kbuf.memsz = fdt_size;
639 kbuf.buf_align = PAGE_SIZE; 642 kbuf.buf_align = PAGE_SIZE;
640 kbuf.top_down = true; 643 kbuf.top_down = true;
644 kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
641 ret = kexec_add_buffer(&kbuf); 645 ret = kexec_add_buffer(&kbuf);
642 if (ret) 646 if (ret)
643 goto out; 647 goto out;