Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2bbe71b authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Ingo Molnar
Browse files

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: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a7d41820

arch/x86/kernel/crash.c

+5 −3
Original line number Diff line number Diff line
@@ -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)