PERFORCE change 67599 for review

[John Baldwin]

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

Change 67599 by jhb at jhb_slimer on 2004/12/23 20:14:30

	IFC @67596 (loop back).

Affected files ...

.. //depot/projects/smpng/sys/i386/i386/local_apic.c#21 integrate
.. //depot/projects/smpng/sys/i386/include/apicvar.h#11 integrate

Differences ...

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

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.9 2004/07/14 18:12:15 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.10 2004/12/23 19:47:58 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/i386/include/apicvar.h#11 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.9 2004/12/07 20:15:01 ups Exp $
+ * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.10 2004/12/23 19:47:59 jhb Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
@@ -106,12 +106,15 @@
  * other deadlocks caused by IPI_STOP.
  */ 
 
+/* Interrupts for local APIC LVT entries other than the timer. */
 /*
  * These interrupt handlers are for IPIs and local interrupts whose handlers
  * do not use any spin locks, so they may still be allowed when a spin lock
  * is held.
  */
 #define	APIC_LOCK_SAFE_INTS (APIC_TIMER_INT + 1)
+#define	APIC_ERROR_INT	APIC_LOCAL_INTS
+#define	APIC_THERMAL_INT (APIC_LOCAL_INTS + 1)
 
 /* Interrupts for local APIC LVT entries other than the timer. */
 #define	APIC_LOCAL_INTS	APIC_LOCK_SAFE_INTS