From owner-p4-projects@FreeBSD.ORG  Thu Dec 23 20:26:19 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 600C816A4D0; Thu, 23 Dec 2004 20:26:19 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 36BF216A4CE
	for <perforce@freebsd.org>; Thu, 23 Dec 2004 20:26:19 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 261FD43D2F
	for <perforce@freebsd.org>; Thu, 23 Dec 2004 20:26:19 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBNKQJah077379
	for <perforce@freebsd.org>; Thu, 23 Dec 2004 20:26:19 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBNKQIRf077376
	for perforce@freebsd.org; Thu, 23 Dec 2004 20:26:18 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 23 Dec 2004 20:26:18 GMT
Message-Id: <200412232026.iBNKQIRf077376@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 67603 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Dec 2004 20:26:20 -0000

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

Change 67603 by jhb@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