1 files changed, 12 insertions, 13 deletions

diff --git a/kernel/kexec.c b/kernel/kexec.c
index 9a8a01abbaed..38c25b1f2fd5 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -444,7 +444,7 @@ arch_kexec_apply_relocations(const Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,
 }
 
 /*
- * Free up memory used by kernel, initrd, and comand line. This is temporary
+ * Free up memory used by kernel, initrd, and command line. This is temporary
  * memory allocation which is not needed any more after these buffers have
  * been loaded into separate segments and have been copied elsewhere.
  */
@@ -856,8 +856,6 @@ static int kimage_set_destination(struct kimage *image,
 
         destination &= PAGE_MASK;
         result = kimage_add_entry(image, destination | IND_DESTINATION);
-        if (result == 0)
-                image->destination = destination;
 
         return result;
 }
@@ -869,8 +867,6 @@ static int kimage_add_page(struct kimage *image, unsigned long page)
 
         page &= PAGE_MASK;
         result = kimage_add_entry(image, page | IND_SOURCE);
-        if (result == 0)
-                image->destination += PAGE_SIZE;
 
         return result;
 }
@@ -1288,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;
@@ -2512,7 +2511,7 @@ static int kexec_apply_relocations(struct kimage *image)
                         continue;
 
                 /*
-                 * Respective archicture needs to provide support for applying
+                 * Respective architecture needs to provide support for applying
                  * relocations of type SHT_RELA/SHT_REL.
                  */
                 if (sechdrs[i].sh_type == SHT_RELA)