Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm64: Use ELF fields defined in 'struct kimage'

ELF related fields elf_headers, elf_headers_sz, and elf_headers_mem
have been moved from 'struct kimage_arch' to 'struct kimage' as
elf_headers, elf_headers_sz, and elf_load_addr respectively.

Use the ELF fields defined in 'struct kimage'.

Suggested-by: Rob Herring <robh@kernel.org>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210221174930.27324-3-nramas@linux.microsoft.com

authored by

Lakshmi Ramasubramanian and committed by
Rob Herring
7b558cc3 9336a5f6

+9 -13
-4
arch/arm64/include/asm/kexec.h
··· 96 96 void *dtb; 97 97 phys_addr_t dtb_mem; 98 98 phys_addr_t kern_reloc; 99 - /* Core ELF header buffer */ 100 - void *elf_headers; 101 - unsigned long elf_headers_mem; 102 - unsigned long elf_headers_sz; 103 99 }; 104 100 105 101 #ifdef CONFIG_KEXEC_FILE
+9 -9
arch/arm64/kernel/machine_kexec_file.c
··· 43 43 vfree(image->arch.dtb); 44 44 image->arch.dtb = NULL; 45 45 46 - vfree(image->arch.elf_headers); 47 - image->arch.elf_headers = NULL; 48 - image->arch.elf_headers_sz = 0; 46 + vfree(image->elf_headers); 47 + image->elf_headers = NULL; 48 + image->elf_headers_sz = 0; 49 49 50 50 return kexec_image_post_load_cleanup_default(image); 51 51 } ··· 73 73 /* add linux,elfcorehdr */ 74 74 ret = fdt_appendprop_addrrange(dtb, 0, off, 75 75 FDT_PROP_KEXEC_ELFHDR, 76 - image->arch.elf_headers_mem, 77 - image->arch.elf_headers_sz); 76 + image->elf_load_addr, 77 + image->elf_headers_sz); 78 78 if (ret) 79 79 return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL); 80 80 ··· 284 284 vfree(headers); 285 285 goto out_err; 286 286 } 287 - image->arch.elf_headers = headers; 288 - image->arch.elf_headers_mem = kbuf.mem; 289 - image->arch.elf_headers_sz = headers_sz; 287 + image->elf_headers = headers; 288 + image->elf_load_addr = kbuf.mem; 289 + image->elf_headers_sz = headers_sz; 290 290 291 291 pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n", 292 - image->arch.elf_headers_mem, kbuf.bufsz, kbuf.memsz); 292 + image->elf_load_addr, kbuf.bufsz, kbuf.memsz); 293 293 } 294 294 295 295 /* load initrd */