aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2004-03-08 00:15:29 +0000
committerPeter Wemm <peter@FreeBSD.org>2004-03-08 00:15:29 +0000
commitc60df69fb2b24e3a97458c6a19ea2d89df404f86 (patch)
tree7df99cb24679c3d0a64fb32e5079ef9f5d73f788
parent1164db57e40de8efae073eba01ba85bb26ae5a8d (diff)
Notes
-rw-r--r--sys/amd64/amd64/local_apic.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/amd64/amd64/local_apic.c b/sys/amd64/amd64/local_apic.c
index 65d8c899f90ef..54efeeadd74e1 100644
--- a/sys/amd64/amd64/local_apic.c
+++ b/sys/amd64/amd64/local_apic.c
@@ -691,8 +691,8 @@ lapic_ipi_raw(register_t icrlo, u_int dest)
intr_restore(eflags);
}
-#ifdef DETECT_DEADLOCK
#define BEFORE_SPIN 1000000
+#ifdef DETECT_DEADLOCK
#define AFTER_SPIN 1000
#endif
@@ -723,11 +723,9 @@ lapic_ipi_vectored(u_int vector, int dest)
destfield = dest;
}
-#ifdef DETECT_DEADLOCK
- /* Check for an earlier stuck IPI. */
+ /* Wait for an earlier IPI to finish. */
if (!lapic_ipi_wait(BEFORE_SPIN))
panic("APIC: Previous IPI is stuck");
-#endif
lapic_ipi_raw(icrlo, destfield);