--- v17
+++ v18
@@ -2,15 +2,14 @@
 
 The architecture specific field, elfcorehdr_addr in struct kimage_arch,
 that holds the address of the buffer in memory for ELF core header for
-powerpc has a different name than the one used for arm64.  This makes
+powerpc has a different name than the one used for x86_64.  This makes
 it hard to have a common code for setting up the device tree for
 kexec system call.
 
-Rename elfcorehdr_addr to elf_headers_mem to align with arm64 name so
+Rename elfcorehdr_addr to elf_load_addr to align with x86_64 name so
 common code can use it.
 
 Signed-off-by: Rob Herring <robh@kernel.org>
-Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
 Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
 ---
  arch/powerpc/include/asm/kexec.h  | 2 +-
@@ -19,7 +18,7 @@
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
-index 55d6ede30c19..dbf09d2f36d0 100644
+index 55d6ede30c19..4d9b250cf1e6 100644
 --- a/arch/powerpc/include/asm/kexec.h
 +++ b/arch/powerpc/include/asm/kexec.h
 @@ -108,7 +108,7 @@ struct kimage_arch {
@@ -27,12 +26,12 @@
  	void *backup_buf;
  
 -	unsigned long elfcorehdr_addr;
-+	unsigned long elf_headers_mem;
++	unsigned long elf_load_addr;
  	unsigned long elf_headers_sz;
  	void *elf_headers;
  
 diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
-index 9a232bc36c8f..e452b11df631 100644
+index 9a232bc36c8f..f7c31daf8a2e 100644
 --- a/arch/powerpc/kexec/file_load.c
 +++ b/arch/powerpc/kexec/file_load.c
 @@ -45,7 +45,7 @@ char *setup_kdump_cmdline(struct kimage *image, char *cmdline,
@@ -40,7 +39,7 @@
  
  	elfcorehdr_strlen = sprintf(cmdline_ptr, "elfcorehdr=0x%lx ",
 -				    image->arch.elfcorehdr_addr);
-+				    image->arch.elf_headers_mem);
++				    image->arch.elf_load_addr);
  
  	if (elfcorehdr_strlen + cmdline_len > COMMAND_LINE_SIZE) {
  		pr_err("Appending elfcorehdr=<addr> exceeds cmdline size\n");
@@ -49,12 +48,12 @@
  		 * setting up memory reserve map.
  		 */
 -		ret = fdt_add_mem_rsv(fdt, image->arch.elfcorehdr_addr,
-+		ret = fdt_add_mem_rsv(fdt, image->arch.elf_headers_mem,
++		ret = fdt_add_mem_rsv(fdt, image->arch.elf_load_addr,
  				      image->arch.elf_headers_sz);
  		if (ret) {
  			pr_err("Error reserving elfcorehdr memory: %s\n",
 diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
-index c69bcf9b547a..a05c19b3cc60 100644
+index c69bcf9b547a..e539b7d401a2 100644
 --- a/arch/powerpc/kexec/file_load_64.c
 +++ b/arch/powerpc/kexec/file_load_64.c
 @@ -815,7 +815,7 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf)
@@ -62,7 +61,7 @@
  	}
  
 -	image->arch.elfcorehdr_addr = kbuf->mem;
-+	image->arch.elf_headers_mem = kbuf->mem;
++	image->arch.elf_load_addr = kbuf->mem;
  	image->arch.elf_headers_sz = headers_sz;
  	image->arch.elf_headers = headers;
  out:
@@ -71,7 +70,7 @@
  	}
  	pr_debug("Loaded elf core header at 0x%lx, bufsz=0x%lx memsz=0x%lx\n",
 -		 image->arch.elfcorehdr_addr, kbuf->bufsz, kbuf->memsz);
-+		 image->arch.elf_headers_mem, kbuf->bufsz, kbuf->memsz);
++		 image->arch.elf_load_addr, kbuf->bufsz, kbuf->memsz);
  
  	return 0;
  }