Sven Schnelle <svens@xxxxxxxxxxxxxx> writes:
> base was never assigned, so we can remove it.
>
> Reviewed-by: Christophe Leroy <christophe.leroy@xxxxxx>
> Signed-off-by: Sven Schnelle <svens@xxxxxxxxxxxxxx>
> ---
> kernel/kexec_elf.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/kexec_elf.c b/kernel/kexec_elf.c
> index e346659af324..9421eebbacf0 100644
> --- a/kernel/kexec_elf.c
> +++ b/kernel/kexec_elf.c
> @@ -350,7 +350,7 @@ int kexec_elf_load(struct kimage *image, struct elfhdr *ehdr,
> struct kexec_buf *kbuf,
> unsigned long *lowest_load_addr)
> {
> - unsigned long base = 0, lowest_addr = UINT_MAX;
> + unsigned long lowest_addr = UINT_MAX;
> int ret;
> size_t i;
>
> @@ -372,7 +372,7 @@ int kexec_elf_load(struct kimage *image, struct elfhdr *ehdr,
> kbuf->bufsz = size;
> kbuf->memsz = phdr->p_memsz;
> kbuf->buf_align = phdr->p_align;
> - kbuf->buf_min = phdr->p_paddr + base;
> + kbuf->buf_min = phdr->p_paddr;
> ret = kexec_add_buffer(kbuf);
> if (ret)
> goto out;
> @@ -382,9 +382,6 @@ int kexec_elf_load(struct kimage *image, struct elfhdr *ehdr,
> lowest_addr = load_addr;
> }
>
> - /* Update entry point to reflect new load address. */
> - ehdr->e_entry += base;
> -
> *lowest_load_addr = lowest_addr;
> ret = 0;
> out:
Reviewed-by: Thiago Jung Bauermann <bauerman@xxxxxxxxxxxxx>
--
Thiago Jung Bauermann
IBM Linux Technology Center
_______________________________________________
kexec mailing list
kexec@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/kexec
