Date: Fri, 3 Sep 2004 15:09:47 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 60957 for review Message-ID: <200409031509.i83F9lw3040900@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=60957 Change 60957 by jhb@jhb_slimer on 2004/09/03 15:09:00 - Remove extra line. - Merge change to amd64. Suggested by: scottl (2) Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#7 edit .. //depot/projects/smpng/sys/i386/i386/local_apic.c#11 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#7 (text+ko) ==== @@ -725,9 +725,15 @@ destfield = dest; } +#ifdef DETECT_DEADLOCK + /* Check for an earlier stuck IPI. */ + if (!lapic_ipi_wait(BEFORE_SPIN)) + panic("APIC: Previous IPI is stuck"); +#else /* Wait for an earlier IPI to finish. */ - if (!lapic_ipi_wait(BEFORE_SPIN)) + if (!lapic_ipi_wait(-1)) panic("APIC: Previous IPI is stuck"); +#endif lapic_ipi_raw(icrlo, destfield); ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#11 (text+ko) ==== @@ -727,7 +727,6 @@ #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"); #else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409031509.i83F9lw3040900>