X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=init%2Finitramfs.c;h=b32ad7d97ac94f52a0c50acd2a904e8a0c2f888d;hb=ac5fd4f4b97f5ac9a01303c024d26f34a99633c8;hp=ad1bd7787bbb0c3298e2f9790b0edd5322227639;hpb=a9e2e4733cb6457aa6cbae4489b68ff0684848af;p=deliverable%2Flinux.git diff --git a/init/initramfs.c b/init/initramfs.c index ad1bd7787bbb..b32ad7d97ac9 100644 --- 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.