aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/machine_kexec_64.c
diff options
context:
space:
mode:
authorGravatar Lakshmi Ramasubramanian <nramas@linux.microsoft.com> 2021-02-21 09:49:21 -0800
committerGravatar Rob Herring <robh@kernel.org> 2021-03-08 12:06:29 -0700
commit179350f00e0663cea76af83b843078eebe1bfbf4 (patch)
treef9c8ff436732ffa3fb49eace0c46d66e91340437 /arch/x86/kernel/machine_kexec_64.c
parentpowerpc: Use ELF fields defined in 'struct kimage' (diff)
downloadlinux-179350f00e0663cea76af83b843078eebe1bfbf4.tar.gz
linux-179350f00e0663cea76af83b843078eebe1bfbf4.tar.bz2
linux-179350f00e0663cea76af83b843078eebe1bfbf4.zip
x86: Use ELF fields defined in 'struct kimage'
ELF related fields elf_headers, elf_headers_sz, and elf_load_addr have been moved from 'struct kimage_arch' to 'struct kimage'. 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> Signed-off-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20210221174930.27324-5-nramas@linux.microsoft.com
Diffstat (limited to 'arch/x86/kernel/machine_kexec_64.c')
-rw-r--r--arch/x86/kernel/machine_kexec_64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index a29a44a98e5b..055c18a6f7bf 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@ -402,8 +402,8 @@ void machine_kexec(struct kimage *image)
#ifdef CONFIG_KEXEC_FILE
void *arch_kexec_kernel_image_load(struct kimage *image)
{
- vfree(image->arch.elf_headers);
- image->arch.elf_headers = NULL;
+ vfree(image->elf_headers);
+ image->elf_headers = NULL;
if (!image->fops || !image->fops->load)
return ERR_PTR(-ENOEXEC);