diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2008-11-12 11:34:38 -0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 18:55:44 +0100 |
| commit | b2bbe71b829564fb65a6bc7e1e25e02d70cffce8 (patch) | |
| tree | fa8ac6bf84540f98b2c4e7aa20cbe6460143312d /arch/x86/kernel/crash.c | |
| parent | a7d41820f683c35b53af719210a51f6aa0f86a6a (diff) | |
| download | linux-b2bbe71b829564fb65a6bc7e1e25e02d70cffce8.tar.bz2 | |
x86 kdump: move crashing_cpu assignment to nmi_shootdown_cpus()
Impact: cleanup
This variable will be moved to non-kdump-specific code.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/crash.c')
| -rw-r--r-- | arch/x86/kernel/crash.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 60475422a51a..ed2f0f9dc894 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -29,10 +29,11 @@ #include <mach_ipi.h> +#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) + /* This keeps a track of which one is crashing cpu. */ static int crashing_cpu; -#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) static atomic_t waiting_for_crash_ipi; static void kdump_nmi_callback(int cpu, struct die_args *args) @@ -100,6 +101,9 @@ static void nmi_shootdown_cpus(void) { unsigned long msecs; + /* Make a note of crashing cpu. Will be used in NMI callback.*/ + crashing_cpu = safe_smp_processor_id(); + atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1); /* Would it be better to replace the trap vector here? */ if (register_die_notifier(&crash_nmi_nb)) @@ -140,8 +144,6 @@ void native_machine_crash_shutdown(struct pt_regs *regs) /* The kernel is broken so disable interrupts */ local_irq_disable(); - /* Make a note of crashing cpu. Will be used in NMI callback.*/ - crashing_cpu = safe_smp_processor_id(); nmi_shootdown_cpus(); lapic_shutdown(); #if defined(CONFIG_X86_IO_APIC) |