Skip to content

Commit

Permalink
x86 kdump: move crashing_cpu assignment to nmi_shootdown_cpus()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eduardo Habkost authored and Ingo Molnar committed Nov 12, 2008
1 parent a7d4182 commit b2bbe71
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions arch/x86/kernel/crash.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit b2bbe71

Please sign in to comment.