From: Simon Horman elfcore header memory needs to be reserved in a crash kernel. This means that the relevant code should be protected by CONFIG_CRASH_DUMP rather than CONFIG_PROC_VMCORE. Signed-off-by: Simon Horman Cc: Vivek Goyal Signed-off-by: Andrew Morton --- arch/ia64/kernel/efi.c | 2 +- arch/ia64/kernel/setup.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff -puN arch/ia64/kernel/efi.c~kdump-ia64-always-reserve-elfcore-header-memory-in-crash-kernel arch/ia64/kernel/efi.c --- a/arch/ia64/kernel/efi.c~kdump-ia64-always-reserve-elfcore-header-memory-in-crash-kernel +++ a/arch/ia64/kernel/efi.c @@ -1334,7 +1334,7 @@ kdump_find_rsvd_region (unsigned long si } #endif -#ifdef CONFIG_PROC_VMCORE +#ifdef CONFIG_CRASH_DUMP /* locate the size find a the descriptor at a certain address */ unsigned long __init vmcore_find_descriptor_size (unsigned long address) diff -puN arch/ia64/kernel/setup.c~kdump-ia64-always-reserve-elfcore-header-memory-in-crash-kernel arch/ia64/kernel/setup.c --- a/arch/ia64/kernel/setup.c~kdump-ia64-always-reserve-elfcore-header-memory-in-crash-kernel +++ a/arch/ia64/kernel/setup.c @@ -352,7 +352,7 @@ reserve_memory (void) } #endif -#ifdef CONFIG_PROC_VMCORE +#ifdef CONFIG_CRASH_KERNEL if (reserve_elfcorehdr(&rsvd_region[n].start, &rsvd_region[n].end) == 0) n++; @@ -496,9 +496,7 @@ static int __init parse_elfcorehdr(char return 0; } early_param("elfcorehdr", parse_elfcorehdr); -#endif -#ifdef CONFIG_PROC_VMCORE int __init reserve_elfcorehdr(unsigned long *start, unsigned long *end) { unsigned long length; _