From: Bernhard Walle This patch removes the crashkernel parsing from arch/i386/kernel/machine_kexec.c and calls the generic function, introduced in the last patch, in setup_bootmem_allocator(). This is necessary because the amount of System RAM must be known in this function now because of the new syntax. Signed-off-by: Bernhard Walle Cc: Andi Kleen Cc: Vivek Goyal Cc: "Eric W. Biederman" DESC Fix CONFIG_NOHIGHMEM for extended crashkernel command line EDESC From: Bernhard Walle This patch fixes a build error with CONFIG_KEXEC=y and CONFIG_NOHIGHMEM=y. linux-2.6-mm$ LANG=C make CHK include/linux/version.h CHK include/linux/utsrelease.h CALL scripts/checksyscalls.sh CHK include/linux/compile.h CC arch/i386/kernel/setup.o arch/i386/kernel/setup.c: In function 'reserve_crashkernel': arch/i386/kernel/setup.c:391: error: 'highend_pfn' undeclared (first use in this function) arch/i386/kernel/setup.c:391: error: (Each undeclared identifier is reported only once arch/i386/kernel/setup.c:391: error: for each function it appears in.) arch/i386/kernel/setup.c:391: error: 'highstart_pfn' undeclared (first use in this function) make[1]: *** [arch/i386/kernel/setup.o] Error 1 make: *** [arch/i386/kernel] Error 2 Signed-off-by: Bernhard Walle DESC fix-config_nohighmem-for-extended-crashkernel-command-line-fix EDESC From: Andrew Morton Cc: Bernhard Walle Signed-off-by: Andrew Morton --- arch/i386/kernel/e820.c | 3 + arch/i386/kernel/machine_kexec.c | 22 ------------ arch/i386/kernel/setup.c | 50 ++++++++++++++++++++++++++--- 3 files changed, 47 insertions(+), 28 deletions(-) diff -puN arch/i386/kernel/e820.c~use-extended-crashkernel-command-line-on-i386 arch/i386/kernel/e820.c --- a/arch/i386/kernel/e820.c~use-extended-crashkernel-command-line-on-i386 +++ a/arch/i386/kernel/e820.c @@ -288,7 +288,8 @@ legacy_init_iomem_resources(struct resou request_resource(res, code_resource); request_resource(res, data_resource); #ifdef CONFIG_KEXEC - request_resource(res, &crashk_res); + if (crashk_res.start != crashk_res.end) + request_resource(res, &crashk_res); #endif } } diff -puN arch/i386/kernel/machine_kexec.c~use-extended-crashkernel-command-line-on-i386 arch/i386/kernel/machine_kexec.c --- a/arch/i386/kernel/machine_kexec.c~use-extended-crashkernel-command-line-on-i386 +++ a/arch/i386/kernel/machine_kexec.c @@ -149,28 +149,6 @@ NORET_TYPE void machine_kexec(struct kim image->start, cpu_has_pae); } -/* crashkernel=size@addr specifies the location to reserve for - * a crash kernel. By reserving this memory we guarantee - * that linux never sets it up as a DMA target. - * Useful for holding code to do something appropriate - * after a kernel panic. - */ -static int __init parse_crashkernel(char *arg) -{ - unsigned long size, base; - size = memparse(arg, &arg); - if (*arg == '@') { - base = memparse(arg+1, &arg); - /* FIXME: Do I want a sanity check - * to validate the memory range? - */ - crashk_res.start = base; - crashk_res.end = base + size - 1; - } - return 0; -} -early_param("crashkernel", parse_crashkernel); - void arch_crash_save_vmcoreinfo(void) { #ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE diff -puN arch/i386/kernel/setup.c~use-extended-crashkernel-command-line-on-i386 arch/i386/kernel/setup.c --- a/arch/i386/kernel/setup.c~use-extended-crashkernel-command-line-on-i386 +++ a/arch/i386/kernel/setup.c @@ -381,6 +381,50 @@ extern unsigned long __init setup_memory extern void zone_sizes_init(void); #endif /* !CONFIG_NEED_MULTIPLE_NODES */ +#ifdef CONFIG_HIGHMEM +static inline unsigned long long get_total_mem(void) +{ + return (unsigned long long) + (max_low_pfn + highend_pfn - highstart_pfn) << PAGE_SHIFT; +} +#else +static inline unsigned long long get_total_mem(void) +{ + return (unsigned long long)max_low_pfn << PAGE_SHIFT; +} +#endif + +#ifdef CONFIG_KEXEC +static void __init reserve_crashkernel(void) +{ + unsigned long long free_mem; + unsigned long long crash_size, crash_base; + int ret; + + free_mem = get_total_mem(); + + ret = parse_crashkernel(boot_command_line, free_mem, + &crash_size, &crash_base); + if (ret == 0 && crash_size > 0) { + if (crash_base > 0) { + printk(KERN_INFO "Reserving %ldMB of memory at %ldMB " + "for crashkernel (System RAM: %ldMB)\n", + (unsigned long)(crash_size >> 20), + (unsigned long)(crash_base >> 20), + (unsigned long)(free_mem >> 20)); + crashk_res.start = crash_base; + crashk_res.end = crash_base + crash_size - 1; + reserve_bootmem(crash_base, crash_size); + } else + printk(KERN_INFO "crashkernel reservation failed - " + "you have to specify a base address\n"); + } +} +#else +static inline void __init reserve_crashkernel(void) +{} +#endif + void __init setup_bootmem_allocator(void) { unsigned long bootmap_size; @@ -456,11 +500,7 @@ void __init setup_bootmem_allocator(void } } #endif -#ifdef CONFIG_KEXEC - if (crashk_res.start != crashk_res.end) - reserve_bootmem(crashk_res.start, - crashk_res.end - crashk_res.start + 1); -#endif + reserve_crashkernel(); } /* _