diff options
| author | Horms | 2006-12-12 09:49:03 +0100 |
|---|---|---|
| committer | Tony Luck | 2006-12-12 19:11:00 +0100 |
| commit | 45a98fc622ae700eed34eb2be00743910d50dbe1 (patch) | |
| tree | e5e5279c25582a7d26c37af189330318fe0f42dd /arch/ia64/kernel/mca.c | |
| parent | [IA64] Do not call SN_SAL_SET_CPU_NUMBER twice on cpu 0 (diff) | |
| download | kernel-qcow2-linux-45a98fc622ae700eed34eb2be00743910d50dbe1.tar.gz kernel-qcow2-linux-45a98fc622ae700eed34eb2be00743910d50dbe1.tar.xz kernel-qcow2-linux-45a98fc622ae700eed34eb2be00743910d50dbe1.zip | |
[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/mca.c')
| -rw-r--r-- | arch/ia64/kernel/mca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 87c1c4f42872..a76add3e76a2 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -1239,7 +1239,7 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw, } else { /* Dump buffered message to console */ ia64_mlogbuf_finish(1); -#ifdef CONFIG_CRASH_DUMP +#ifdef CONFIG_KEXEC atomic_set(&kdump_in_progress, 1); monarch_cpu = -1; #endif |