diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-21 21:02:20 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:50:13 +0200 |
| commit | 17b4cceb1feb2a8865ce47064dd3bd446063a5d5 (patch) | |
| tree | acdc963f0300a786a2a86eeb451b6913087b58a0 /arch/x86 | |
| parent | ce97c40e28223c148e142bda7af48fd0f27c81f9 (diff) | |
x86: move elfcorehdr parsing to setup.c
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/setup.c | 19 | ||||
| -rw-r--r-- | arch/x86/kernel/setup_32.c | 16 |
2 files changed, 19 insertions, 16 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 3b9ec81ba4f..5497fb9b00a 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -4,6 +4,7 @@ #include <linux/bootmem.h> #include <linux/percpu.h> #include <linux/kexec.h> +#include <linux/crash_dump.h> #include <asm/smp.h> #include <asm/percpu.h> #include <asm/sections.h> @@ -501,3 +502,21 @@ void __init reserve_standard_io_resources(void) } +#ifdef CONFIG_PROC_VMCORE +/* elfcorehdr= specifies the location of elf core header + * stored by the crashed kernel. This option will be passed + * by kexec loader to the capture kernel. + */ +static int __init setup_elfcorehdr(char *arg) +{ + char *end; + if (!arg) + return -EINVAL; + elfcorehdr_addr = memparse(arg, &end); + return end > arg ? 0 : -EINVAL; +} +early_param("elfcorehdr", setup_elfcorehdr); +#endif + + + diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 2574ec8234c..d24ac268523 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c @@ -42,7 +42,6 @@ #include <linux/iscsi_ibft.h> #include <linux/nodemask.h> #include <linux/kexec.h> -#include <linux/crash_dump.h> #include <linux/dmi.h> #include <linux/pfn.h> #include <linux/pci.h> @@ -194,21 +193,6 @@ static inline void copy_edd(void) } #endif -#ifdef CONFIG_PROC_VMCORE -/* elfcorehdr= specifies the location of elf core header - * stored by the crashed kernel. - */ -static int __init parse_elfcorehdr(char *arg) -{ - if (!arg) - return -EINVAL; - - elfcorehdr_addr = memparse(arg, &arg); - return 0; -} -early_param("elfcorehdr", parse_elfcorehdr); -#endif /* CONFIG_PROC_VMCORE */ - /* * highmem=size forces highmem to be exactly 'size' bytes. * This works even on boxes that have no highmem otherwise. |