kexec: simplify conditional

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>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Maximilian Attems <max@stro.at>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 7 deletions

diff --git a/kernel/kexec.c b/kernel/kexec.c
index e9a6be4d1ebb..38c25b1f2fd5 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1284,19 +1284,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;