Commit b7ab6e3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86/apic fix from Ingo Molnar:
 "A single fix to the IO-APIC / local-APIC shutdown sequence"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Disable I/O APIC before shutdown of the local APIC
parents 87093826 522e6646

arch/x86/kernel/crash.c

+1 −1
Original line number Diff line number Diff line
@@ -127,12 +127,12 @@ void native_machine_crash_shutdown(struct pt_regs *regs) 
	cpu_emergency_vmxoff();

	cpu_emergency_svm_disable();



	lapic_shutdown();

#ifdef CONFIG_X86_IO_APIC

	/* Prevent crash_kexec() from deadlocking on ioapic_lock. */

	ioapic_zap_locks();

	disable_IO_APIC();

#endif

	lapic_shutdown();

#ifdef CONFIG_HPET_TIMER

	hpet_disable();

#endif

arch/x86/kernel/reboot.c

+4 −4
Original line number Diff line number Diff line
@@ -550,6 +550,10 @@ static void native_machine_emergency_restart(void) 
void native_machine_shutdown(void)

{

	/* Stop the cpus and apics */

#ifdef CONFIG_X86_IO_APIC

	disable_IO_APIC();

#endif



#ifdef CONFIG_SMP

	/*

	 * Stop all of the others. Also disable the local irq to
@@ -562,10 +566,6 @@ void native_machine_shutdown(void) 


	lapic_shutdown();



#ifdef CONFIG_X86_IO_APIC

	disable_IO_APIC();

#endif



#ifdef CONFIG_HPET_TIMER

	hpet_disable();

#endif