Merge tag 'md/4.3-rc7-fixes' of git://neil.brown.name/md

[karo-tx-linux.git] / init / initramfs.c

diff --git a/init/initramfs.c b/init/initramfs.c
index ad1bd7787bbb0c3298e2f9790b0edd5322227639..b32ad7d97ac94f52a0c50acd2a904e8a0c2f888d 100644 (file)
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -526,14 +526,14 @@ extern unsigned long __initramfs_size;
 
 static void __init free_initrd(void)
 {
-#ifdef CONFIG_KEXEC
+#ifdef CONFIG_KEXEC_CORE
        unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
        unsigned long crashk_end   = (unsigned long)__va(crashk_res.end);
 #endif
        if (do_retain_initrd)
                goto skip;
 
-#ifdef CONFIG_KEXEC
+#ifdef CONFIG_KEXEC_CORE
        /*
         * If the initrd region is overlapped with crashkernel reserved region,
         * free only memory that is not part of crashkernel region.