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

Commit b4452218 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86-64: Enable interrupts during delay calibration on APs



We used to disable them to work around a bug, but that
is not needed anymore. Keeping them enabled avoids the NMI
watchdog triggering in some cases.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 70556463
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -413,8 +413,13 @@ void __cpuinit smp_callin(void)

	/*
	 * Get our bogomips.
 	 *
 	 * Need to enable IRQs because it can take longer and then
	 * the NMI watchdog might kill us.
	 */
	local_irq_enable();
	calibrate_delay();
	local_irq_disable();
	Dprintk("Stack at about %p\n",&cpuid);

	disable_APIC_timer();