diff options
-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) | |||
491 | 491 | ||
492 | } | 492 | } |
493 | 493 | ||
494 | #ifdef CONFIG_PROC_VMCORE | ||
495 | /* elfcorehdr= specifies the location of elf core header | ||
496 | * stored by the crashed kernel. This option will be passed | ||
497 | * by kexec loader to the capture kernel. | ||
498 | */ | ||
499 | static int __init setup_elfcorehdr(char *arg) | ||
500 | { | ||
501 | char *end; | ||
502 | if (!arg) | ||
503 | return -EINVAL; | ||
504 | elfcorehdr_addr = memparse(arg, &end); | ||
505 | return end > arg ? 0 : -EINVAL; | ||
506 | } | ||
507 | early_param("elfcorehdr", setup_elfcorehdr); | ||
508 | #endif | ||
509 | |||
494 | /* | 510 | /* |
495 | * Determine if we were loaded by an EFI loader. If so, then we have also been | 511 | * Determine if we were loaded by an EFI loader. If so, then we have also been |
496 | * passed the efi memmap, systab, etc., so we should use these data structures | 512 | * 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); | |||
387 | 387 | ||
388 | #endif /* X86_64_NUMA */ | 388 | #endif /* X86_64_NUMA */ |
389 | 389 | ||
390 | |||
391 | #ifdef CONFIG_PROC_VMCORE | ||
392 | /* elfcorehdr= specifies the location of elf core header | ||
393 | * stored by the crashed kernel. This option will be passed | ||
394 | * by kexec loader to the capture kernel. | ||
395 | */ | ||
396 | static int __init setup_elfcorehdr(char *arg) | ||
397 | { | ||
398 | char *end; | ||
399 | if (!arg) | ||
400 | return -EINVAL; | ||
401 | elfcorehdr_addr = memparse(arg, &end); | ||
402 | return end > arg ? 0 : -EINVAL; | ||
403 | } | ||
404 | early_param("elfcorehdr", setup_elfcorehdr); | ||
405 | #endif | ||
406 | |||
407 | |||
408 | |||