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

Commit 3d1675b4 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] i386 kexec-on-panic: Don't shutdown the apics. 



It is dangerous to shutdown the apics in machine_crash_shutdown.

With my previous patch to initialize apics in init_IRQ we should be able to
boot a kernel without this.  As long as we reinitialize the APICs we don't
care what state they were in during bootup.

This should make machine_crash_shutdown noticeably more reliable.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f2b36db6

arch/i386/kernel/crash.c

+0 −7
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <asm/hardirq.h>

#include <asm/nmi.h>

#include <asm/hw_irq.h>

#include <asm/apic.h>

#include <mach_ipi.h>
@@ -148,7 +147,6 @@ static int crash_nmi_callback(struct pt_regs *regs, int cpu) 
		regs = &fixed_regs;

	}

	crash_save_this_cpu(regs, cpu);

	disable_local_APIC();

	atomic_dec(&waiting_for_crash_ipi);

	/* Assume hlt works */

	halt();
@@ -188,7 +186,6 @@ static void nmi_shootdown_cpus(void) 
	}



	/* Leave the nmi callback set */

	disable_local_APIC();

}

#else

static void nmi_shootdown_cpus(void)
@@ -213,9 +210,5 @@ void machine_crash_shutdown(struct pt_regs *regs) 
	/* Make a note of crashing cpu. Will be used in NMI callback.*/

	crashing_cpu = smp_processor_id();

	nmi_shootdown_cpus();

	lapic_shutdown();

#if defined(CONFIG_X86_IO_APIC)

	disable_IO_APIC();

#endif

	crash_save_self(regs);

}