PERFORCE change 61618 for review

[John Baldwin]

http://perforce.freebsd.org/chv.cgi?CH=61618

Change 61618 by jhb at jhb_slimer on 2004/09/16 15:13:54

	Revert change on amd64 as well and fix a compile tweak on i386.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#8 edit
.. //depot/projects/smpng/sys/i386/i386/local_apic.c#13 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#8 (text+ko) ====

@@ -725,15 +725,9 @@
 		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(-1))
-		panic("APIC: Previous IPI is stuck");
-#endif
 
 	lapic_ipi_raw(icrlo, destfield);
 

==== //depot/projects/smpng/sys/i386/i386/local_apic.c#13 (text+ko) ====

@@ -693,8 +693,8 @@
 	intr_restore(eflags);
 }
 
+#define	BEFORE_SPIN	1000000
 #ifdef DETECT_DEADLOCK
-#define	BEFORE_SPIN	1000000
 #define	AFTER_SPIN	1000
 #endif