diff options
author | Horms <horms@verge.net.au> | 2006-12-12 03:49:03 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-12-12 13:11:00 -0500 |
commit | 45a98fc622ae700eed34eb2be00743910d50dbe1 (patch) | |
tree | e5e5279c25582a7d26c37af189330318fe0f42dd /arch/ia64/kernel/setup.c | |
parent | adf142e379bd20ad906a7e36f722eaabb3b44b0c (diff) |
[IA64] CONFIG_KEXEC/CONFIG_CRASH_DUMP permutations
Actually, on reflection I think that there is a good case for
keeping the options separate. I am thinking particularly of people
who want a very small crashdump kernel and thus don't want to compile
in kexec.
The patch below should fix things up so that all valid combinations of
KEXEC, CRASH_DUMP and VMCORE compile cleanly - VMCORE depends on
CRASH_DUMP which is why I said valid combinations. In a nutshell
it just untangles unrelated code and switches around a few defines.
Please note that it creats a new file, arch/ia64/kernel/crash_dump.c
This is in keeping with the i386 implementation.
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/setup.c')
-rw-r--r-- | arch/ia64/kernel/setup.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 14e1200376a9..66377baea6a5 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -434,6 +434,21 @@ static __init int setup_nomca(char *s) | |||
434 | } | 434 | } |
435 | early_param("nomca", setup_nomca); | 435 | early_param("nomca", setup_nomca); |
436 | 436 | ||
437 | #ifdef CONFIG_PROC_VMCORE | ||
438 | /* elfcorehdr= specifies the location of elf core header | ||
439 | * stored by the crashed kernel. | ||
440 | */ | ||
441 | static int __init parse_elfcorehdr(char *arg) | ||
442 | { | ||
443 | if (!arg) | ||
444 | return -EINVAL; | ||
445 | |||
446 | elfcorehdr_addr = memparse(arg, &arg); | ||
447 | return 0; | ||
448 | } | ||
449 | early_param("elfcorehdr", parse_elfcorehdr); | ||
450 | #endif /* CONFIG_PROC_VMCORE */ | ||
451 | |||
437 | void __init | 452 | void __init |
438 | setup_arch (char **cmdline_p) | 453 | setup_arch (char **cmdline_p) |
439 | { | 454 | { |