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/smp.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/smp.c')
-rw-r--r-- | arch/ia64/kernel/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c index b1b9aa4364b9..f4c7f7769cf7 100644 --- a/arch/ia64/kernel/smp.c +++ b/arch/ia64/kernel/smp.c | |||
@@ -157,7 +157,7 @@ handle_IPI (int irq, void *dev_id) | |||
157 | case IPI_CPU_STOP: | 157 | case IPI_CPU_STOP: |
158 | stop_this_cpu(); | 158 | stop_this_cpu(); |
159 | break; | 159 | break; |
160 | #ifdef CONFIG_CRASH_DUMP | 160 | #ifdef CONFIG_KEXEC |
161 | case IPI_KDUMP_CPU_STOP: | 161 | case IPI_KDUMP_CPU_STOP: |
162 | unw_init_running(kdump_cpu_freeze, NULL); | 162 | unw_init_running(kdump_cpu_freeze, NULL); |
163 | break; | 163 | break; |
@@ -219,7 +219,7 @@ send_IPI_self (int op) | |||
219 | send_IPI_single(smp_processor_id(), op); | 219 | send_IPI_single(smp_processor_id(), op); |
220 | } | 220 | } |
221 | 221 | ||
222 | #ifdef CONFIG_CRASH_DUMP | 222 | #ifdef CONFIG_KEXEC |
223 | void | 223 | void |
224 | kdump_smp_send_stop() | 224 | kdump_smp_send_stop() |
225 | { | 225 | { |