Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1420498

Re: [PATCH 1/8] kexec_file: Remove unused members from struct kexec_buf.

Show all headers | View raw

On 06/12/16 at 12:10am, Thiago Jung Bauermann wrote:
> kexec_add_buffer uses kexec_buf.buffer and kexec_buf.bufsz to pass along
> its own arguments buffer and bufsz, but since they aren't used anywhere
> else, it's pointless.
> 
> Cc: Eric Biederman <ebiederm@xmission.com>
> Cc: kexec@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
>  kernel/kexec_file.c     | 6 ++----
>  kernel/kexec_internal.h | 2 --
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
> index 01ab82a40d22..b6eec7527e9f 100644
> --- a/kernel/kexec_file.c
> +++ b/kernel/kexec_file.c
> @@ -464,8 +464,6 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz,
>  	memset(&buf, 0, sizeof(struct kexec_buf));
>  	kbuf = &buf;
>  	kbuf->image = image;
> -	kbuf->buffer = buffer;
> -	kbuf->bufsz = bufsz;
>  
>  	kbuf->memsz = ALIGN(memsz, PAGE_SIZE);
>  	kbuf->buf_align = max(buf_align, PAGE_SIZE);
> @@ -489,8 +487,8 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz,
>  
>  	/* Found a suitable memory range */
>  	ksegment = &image->segment[image->nr_segments];
> -	ksegment->kbuf = kbuf->buffer;
> -	ksegment->bufsz = kbuf->bufsz;
> +	ksegment->kbuf = buffer;
> +	ksegment->bufsz = bufsz;
>  	ksegment->mem = kbuf->mem;
>  	ksegment->memsz = kbuf->memsz;
>  	image->nr_segments++;
> diff --git a/kernel/kexec_internal.h b/kernel/kexec_internal.h
> index 0a52315d9c62..eefd5bf960c2 100644
> --- a/kernel/kexec_internal.h
> +++ b/kernel/kexec_internal.h
> @@ -26,8 +26,6 @@ struct kexec_sha_region {
>   */
>  struct kexec_buf {
>  	struct kimage *image;
> -	char *buffer;
> -	unsigned long bufsz;
>  	unsigned long mem;
>  	unsigned long memsz;
>  	unsigned long buf_align;
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> kexec mailing list
> kexec@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec

Acked-by: Dave Young <dyoung@redhat.com>

Thanks
Dave

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/8] kexec_file_load implementation for PowerPC Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - 2016-06-12 05:20 +0200
  [PATCH 4/8] powerpc: Generalize elf64_apply_relocate_add. Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - 2016-06-12 05:20 +0200
  [PATCH 2/8] kexec_file: Generalize kexec_add_buffer. Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - 2016-06-12 05:20 +0200
    Re: [PATCH 2/8] kexec_file: Generalize kexec_add_buffer. Dave Young <dyoung@redhat.com> - 2016-06-13 09:20 +0200
    Re: [PATCH 2/8] kexec_file: Generalize kexec_add_buffer. Dave Young <dyoung@redhat.com> - 2016-06-13 09:30 +0200
      Re: [PATCH 2/8] kexec_file: Generalize kexec_add_buffer. Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - 2016-06-13 21:10 +0200
        Re: [PATCH 2/8] kexec_file: Generalize kexec_add_buffer. Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - 2016-06-13 22:50 +0200
        Re: [PATCH 2/8] kexec_file: Generalize kexec_add_buffer. Dave Young <dyoung@redhat.com> - 2016-06-14 03:30 +0200
  [PATCH 1/8] kexec_file: Remove unused members from struct kexec_buf. Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - 2016-06-12 05:20 +0200
    Re: [PATCH 1/8] kexec_file: Remove unused members from struct  kexec_buf. Dave Young <dyoung@redhat.com> - 2016-06-13 09:10 +0200
  [PATCH 7/8] powerpc: Add support for loading ELF kernels with kexec_file_load. Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - 2016-06-12 05:20 +0200
  [PATCH 8/8] powerpc: Add purgatory for kexec_file_load implementation. Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - 2016-06-12 05:20 +0200
  [PATCH 3/8] powerpc: Factor out relocation code from module_64.c to elf_util_64.c. Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - 2016-06-12 05:20 +0200
  [PATCH 5/8] powerpc: Add functions to read ELF files of any endianness. Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - 2016-06-12 05:20 +0200
  [PATCH 6/8] powerpc: Implement kexec_file_load. Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> - 2016-06-12 05:20 +0200
  Re: [PATCH 0/8] kexec_file_load implementation for PowerPC Dave Young <dyoung@redhat.com> - 2016-06-13 09:10 +0200

csiph-web