Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kernel/git/galak/powerpc

2 files changed, 23 insertions, 2 deletions

diff --git a/init/initramfs.c b/init/initramfs.c
index 0c5d9a3f95..637344b059 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -466,10 +466,32 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
 extern char __initramfs_start[], __initramfs_end[];
 #ifdef CONFIG_BLK_DEV_INITRD
 #include <linux/initrd.h>
+#include <linux/kexec.h>
 
 static void __init free_initrd(void)
 {
-        free_initrd_mem(initrd_start, initrd_end);
+#ifdef CONFIG_KEXEC
+        unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
+        unsigned long crashk_end   = (unsigned long)__va(crashk_res.end);
+
+        /*
+         * If the initrd region is overlapped with crashkernel reserved region,
+         * free only memory that is not part of crashkernel region.
+         */
+        if (initrd_start < crashk_end && initrd_end > crashk_start) {
+                /*
+                 * Initialize initrd memory region since the kexec boot does
+                 * not do.
+                 */
+                memset((void *)initrd_start, 0, initrd_end - initrd_start);
+                if (initrd_start < crashk_start)
+                        free_initrd_mem(initrd_start, crashk_start);
+                if (initrd_end > crashk_end)
+                        free_initrd_mem(crashk_end, initrd_end);
+        } else
+#endif
+                free_initrd_mem(initrd_start, initrd_end);
+
         initrd_start = 0;
         initrd_end = 0;
 }
diff --git a/init/main.c b/init/main.c
index 7c79da57d3..4c194c4739 100644
--- a/init/main.c
+++ b/init/main.c
@@ -668,7 +668,6 @@ static int init(void * unused)
          */
         child_reaper = current;
 
-        /* Sets up cpus_possible() */
         smp_prepare_cpus(max_cpus);
 
         do_pre_smp_initcalls();