[PATCH 1/3] x86/crash: remove the unused image parameter from prepare_elf_headers()

Baoquan He bhe at redhat.com
Thu Dec 14 19:27:43 PST 2023


On 12/15/23 at 12:38am, Yuntao Wang wrote:
> The image parameter is no longer in use, remove it. Also, tidy up the code
> formatting.
> 
> Signed-off-by: Yuntao Wang <ytcoode at gmail.com>
> ---
>  arch/x86/kernel/crash.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Acked-by: Baoquan He <bhe at redhat.com>

> 
> diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
> index c92d88680dbf..792231a56d11 100644
> --- a/arch/x86/kernel/crash.c
> +++ b/arch/x86/kernel/crash.c
> @@ -198,8 +198,8 @@ static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)
>  }
>  
>  /* Prepare elf headers. Return addr and size */
> -static int prepare_elf_headers(struct kimage *image, void **addr,
> -					unsigned long *sz, unsigned long *nr_mem_ranges)
> +static int prepare_elf_headers(void **addr, unsigned long *sz,
> +			       unsigned long *nr_mem_ranges)
>  {
>  	struct crash_mem *cmem;
>  	int ret;
> @@ -221,7 +221,7 @@ static int prepare_elf_headers(struct kimage *image, void **addr,
>  	*nr_mem_ranges = cmem->nr_ranges;
>  
>  	/* By default prepare 64bit headers */
> -	ret =  crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), addr, sz);
> +	ret = crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), addr, sz);
>  
>  out:
>  	vfree(cmem);
> @@ -349,7 +349,7 @@ int crash_load_segments(struct kimage *image)
>  				  .buf_max = ULONG_MAX, .top_down = false };
>  
>  	/* Prepare elf headers and add a segment */
> -	ret = prepare_elf_headers(image, &kbuf.buffer, &kbuf.bufsz, &pnum);
> +	ret = prepare_elf_headers(&kbuf.buffer, &kbuf.bufsz, &pnum);
>  	if (ret)
>  		return ret;
>  
> @@ -452,7 +452,7 @@ void arch_crash_handle_hotplug_event(struct kimage *image)
>  	 * Create the new elfcorehdr reflecting the changes to CPU and/or
>  	 * memory resources.
>  	 */
> -	if (prepare_elf_headers(image, &elfbuf, &elfsz, &nr_mem_ranges)) {
> +	if (prepare_elf_headers(&elfbuf, &elfsz, &nr_mem_ranges)) {
>  		pr_err("unable to create new elfcorehdr");
>  		goto out;
>  	}
> -- 
> 2.43.0
> 




More information about the kexec mailing list