From: Sven Schnelle <svens@stackframe.org>
To: kexec@lists.infradead.org
Cc: Sven Schnelle <svens@stackframe.org>,
deller@gmx.de, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v4 6/7] kexec_elf: remove unused variable in kexec_elf_load()
Date: Mon, 15 Jul 2019 10:27:01 +0200 [thread overview]
Message-ID: <20190715082702.27308-7-svens@stackframe.org> (raw)
In-Reply-To: <20190715082702.27308-1-svens@stackframe.org>
base was never assigned, so we can remove it.
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Sven Schnelle <svens@stackframe.org>
---
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:
--
2.20.1
next prev parent reply other threads:[~2019-07-15 8:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-15 8:26 [PATCH v4 0/7] kexec: add generic support for elf kernel images Sven Schnelle
2019-07-15 8:26 ` [PATCH v4 1/7] kexec: add KEXEC_ELF Sven Schnelle
2019-08-21 0:58 ` Thiago Jung Bauermann
2019-08-21 20:15 ` Thiago Jung Bauermann
2019-07-15 8:26 ` [PATCH v4 2/7] kexec_elf: change order of elf_*_to_cpu() functions Sven Schnelle
2019-08-21 0:59 ` Thiago Jung Bauermann
2019-07-15 8:26 ` [PATCH v4 3/7] kexec_elf: remove parsing of section headers Sven Schnelle
2019-08-21 0:59 ` Thiago Jung Bauermann
2019-07-15 8:26 ` [PATCH v4 4/7] kexec_elf: remove PURGATORY_STACK_SIZE Sven Schnelle
2019-08-21 1:00 ` Thiago Jung Bauermann
2019-08-21 1:13 ` Thiago Jung Bauermann
2019-07-15 8:27 ` [PATCH v4 5/7] kexec_elf: remove Elf_Rel macro Sven Schnelle
2019-08-21 1:01 ` Thiago Jung Bauermann
2019-07-15 8:27 ` Sven Schnelle [this message]
2019-08-21 1:02 ` [PATCH v4 6/7] kexec_elf: remove unused variable in kexec_elf_load() Thiago Jung Bauermann
2019-07-15 8:27 ` [PATCH v4 7/7] kexec_elf: support 32 bit ELF files Sven Schnelle
2019-08-21 1:03 ` Thiago Jung Bauermann
2019-08-21 1:11 ` [PATCH v4 0/7] kexec: add generic support for elf kernel images Thiago Jung Bauermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190715082702.27308-7-svens@stackframe.org \
--to=svens@stackframe.org \
--cc=deller@gmx.de \
--cc=kexec@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).