Index: sys/x86/x86/local_apic.c
===================================================================
--- sys/x86/x86/local_apic.c
+++ sys/x86/x86/local_apic.c
@@ -2082,12 +2082,7 @@
 	icrlo |= APIC_DESTMODE_PHY | APIC_TRIGMOD_EDGE | APIC_LEVEL_ASSERT;
 
 	/* Wait for an earlier IPI to finish. */
-	if (!lapic_ipi_wait(BEFORE_SPIN)) {
-		if (KERNEL_PANICKED())
-			return;
-		else
-			panic("APIC: Previous IPI is stuck");
-	}
+	lapic_ipi_wait(-1);
 
 	lapic_ipi_raw(icrlo, destfield);