PERFORCE change 67603 for review

[John Baldwin]

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

Change 67603 by jhb at jhb_slimer on 2004/12/23 20:26:03

	Mismerge.

Affected files ...

.. //depot/projects/smpng/sys/i386/include/apicvar.h#12 edit

Differences ...

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

@@ -106,15 +106,12 @@
  * 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