diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-26 04:58:55 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 15:10:53 +0400 |
| commit | 0196bcbb150786d54a50e3074013020570a59d31 (patch) | |
| tree | 85cea981816fca6d82334ffd071ff8ffd500ecb1 | |
| parent | bdba0e700c86fa2f152b1fe37b001c9e9c65d2b7 (diff) | |
| download | linux-0196bcbb150786d54a50e3074013020570a59d31.tar.xz | |
x86: move parse elfvorehdr back to setup.c
Signed-off-by: Yinghai <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/setup.c | 16 | ||||
| -rw-r--r-- | arch/x86/kernel/setup_percpu.c | 19 |
2 files changed, 16 insertions, 19 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 62647b04fab5..08efab538a24 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -491,6 +491,22 @@ 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 + /* * Determine if we were loaded by an EFI loader. If so, then we have also been * passed the efi memmap, systab, etc., so we should use these data structures diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index ccf329dc81be..7068f95cccc6 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -387,22 +387,3 @@ EXPORT_SYMBOL(node_to_cpumask); #endif /* X86_64_NUMA */ - -#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 - - - |