From: Vivek Goyal <vgoyal@redhat.com>
To: Geoff Levand <geoff@infradead.org>
Cc: Eric Biederman <ebiederm@xmission.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Andrew Morton <akpm@linux-foundation.org>,
kexec@lists.infradead.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/5] kexec: Simplify conditional
Date: Mon, 25 Aug 2014 13:42:44 -0400 [thread overview]
Message-ID: <20140825174244.GE14379@redhat.com> (raw)
In-Reply-To: <5a3bbdeb26cd8891f2b9de1ce05dbacfc282f7d1.1408731991.git.geoff@infradead.org>
On Fri, Aug 22, 2014 at 06:39:47PM +0000, Geoff Levand wrote:
> Simplify the code around one of the conditionals in the kexec_load
> syscall routine.
>
> The original code was confusing with a redundant check on KEXEC_ON_CRASH
> and comments outside of the conditional block. This change switches the
> order of the conditional check, and cleans up the comments for the
> conditional. There is no functional change to the code.
>
> Signed-off-by: Geoff Levand <geoff@infradead.org>
This is simple reorganization.
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Vivek
> ---
> kernel/kexec.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/kernel/kexec.c b/kernel/kexec.c
> index 0b49a0a..d04b56e 100644
> --- a/kernel/kexec.c
> +++ b/kernel/kexec.c
> @@ -1282,19 +1282,22 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
> if (nr_segments > 0) {
> unsigned long i;
>
> - /* Loading another kernel to reboot into */
> - if ((flags & KEXEC_ON_CRASH) == 0)
> - result = kimage_alloc_init(&image, entry, nr_segments,
> - segments, flags);
> - /* Loading another kernel to switch to if this one crashes */
> - else if (flags & KEXEC_ON_CRASH) {
> - /* Free any current crash dump kernel before
> + if (flags & KEXEC_ON_CRASH) {
> + /*
> + * Loading another kernel to switch to if this one
> + * crashes. Free any current crash dump kernel before
> * we corrupt it.
> */
> +
> kimage_free(xchg(&kexec_crash_image, NULL));
> result = kimage_alloc_init(&image, entry, nr_segments,
> segments, flags);
> crash_map_reserved_pages();
> + } else {
> + /* Loading another kernel to reboot into. */
> +
> + result = kimage_alloc_init(&image, entry, nr_segments,
> + segments, flags);
> }
> if (result)
> goto out;
> --
> 1.9.1
>
>
>
> _______________________________________________
> kexec mailing list
> kexec@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2014-08-25 17:43 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-22 18:39 [PATCH 0/5] kexec: minor fixups and enhancements Geoff Levand
2014-08-22 18:39 ` [PATCH 3/5] kexec: Add bit definitions for kimage entry flags Geoff Levand
2014-08-25 17:52 ` Vivek Goyal
2014-08-22 18:39 ` [PATCH 1/5] kexec: Fix make headers_check Geoff Levand
2014-08-25 17:22 ` Vivek Goyal
2014-08-30 12:47 ` Paul Bolle
2014-10-06 14:12 ` Paul Bolle
2014-10-06 17:34 ` Geoff Levand
2014-10-06 18:21 ` Paul Bolle
2014-10-06 19:28 ` Geoff Levand
2014-10-06 17:44 ` H. Peter Anvin
2014-08-22 18:39 ` [PATCH 5/5] powerpc/kexec: Use global IND_FLAGS macro Geoff Levand
2014-08-22 18:39 ` [PATCH 4/5] kexec: Add " Geoff Levand
2014-08-25 17:54 ` Vivek Goyal
2014-08-22 18:39 ` [PATCH 2/5] kexec: Simplify conditional Geoff Levand
2014-08-25 17:42 ` Vivek Goyal [this message]
2014-08-25 16:59 ` [PATCH 0/5] kexec: minor fixups and enhancements Vivek Goyal
2014-08-26 7:41 ` Dave Young
2014-08-27 0:33 ` Geoff Levand
2014-08-27 0:42 ` Vivek Goyal
2014-10-07 0:21 ` [PATCH V2 0/5] kexec: Minor " Geoff Levand
2014-10-07 0:21 ` [PATCH V25/5] powerpc/kexec: Use global IND_FLAGS macro Geoff Levand
2014-10-07 17:52 ` Vivek Goyal
2014-11-12 19:29 ` [PATCH V3] kexec: Add " Geoff Levand
2014-11-12 23:06 ` Benjamin Herrenschmidt
2014-10-07 0:21 ` [PATCH V22/5] kexec: Simplify conditional Geoff Levand
2014-10-07 0:21 ` [PATCH V21/5] kexec: Fix make headers_check Geoff Levand
2014-10-07 0:21 ` [PATCH V23/5] kexec: Add bit definitions for kimage entry flags Geoff Levand
2014-10-07 0:21 ` [PATCH V24/5] kexec: Add IND_FLAGS macro Geoff Levand
2014-10-07 20:26 ` [PATCH V3 4/5] " Geoff Levand
2014-11-13 0:19 ` [PATCH V3 0/4] kexec: minor fixups and enhancements Geoff Levand
2014-11-13 0:19 ` [PATCH V3 3/4] kexec: Add bit definitions for kimage entry flags Geoff Levand
2014-11-13 0:19 ` [PATCH V3 4/4] kexec: Add IND_FLAGS macro Geoff Levand
2014-11-13 0:19 ` [PATCH V3 2/4] kexec: Simplify conditional Geoff Levand
2014-11-13 0:19 ` [PATCH V3 1/4] kexec: Fix make headers_check Geoff Levand
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=20140825174244.GE14379@redhat.com \
--to=vgoyal@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=ebiederm@xmission.com \
--cc=geoff@infradead.org \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.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).