From owner-p4-projects@FreeBSD.ORG  Fri Nov 14 08:51:24 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4456416A4D0; Fri, 14 Nov 2003 08:51:24 -0800 (PST)
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 1CCC516A4CE
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 08:51:24 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 89DB243FBF
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 08:51:23 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAEGpNXJ049714
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 08:51:23 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAEGpL2Q049711
	for perforce@freebsd.org; Fri, 14 Nov 2003 08:51:21 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Fri, 14 Nov 2003 08:51:21 -0800 (PST)
Message-Id: <200311141651.hAEGpL2Q049711@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42336 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: Fri, 14 Nov 2003 16:51:24 -0000

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

Change 42336 by peter@peter_overcee on 2003/11/14 08:51:01

	integrate -b smp_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#5 integrate
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#11 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#5 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.92 2003/11/12 18:13:57 jhb Exp $
+ * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.93 2003/11/13 18:16:37 jhb Exp $
  */
 
 /*
@@ -134,11 +134,11 @@
 	iretq
 
 MCOUNT_LABEL(bintr2)
-	ISR_VEC(1,apic_isr1)
-	ISR_VEC(2,apic_isr2)
-	ISR_VEC(3,apic_isr3)
-	ISR_VEC(4,apic_isr4)
-	ISR_VEC(5,apic_isr5)
+	ISR_VEC(1, apic_isr1)
+	ISR_VEC(2, apic_isr2)
+	ISR_VEC(3, apic_isr3)
+	ISR_VEC(4, apic_isr4)
+	ISR_VEC(5, apic_isr5)
 MCOUNT_LABEL(eintr2)
 
 #ifdef SMP

==== //depot/projects/hammer/sys/amd64/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.2 2003/11/12 18:13:57 jhb Exp $
+ * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.3 2003/11/13 16:41:07 jhb Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
@@ -42,7 +42,7 @@
  * Layout of local APIC interrupt vectors:
  *
  *	0xff (255)  +-------------+
- *                  |             | 15 (Spurios Vector)
+ *                  |             | 15 (Spurious Vector)
  *	0xf0 (240)  +-------------+
  *                  |             | 14 (Interprocessor Interrupts)
  *	0xe0 (224)  +-------------+