From owner-p4-projects@FreeBSD.ORG  Mon Feb  7 16:53:18 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9DCAD16A4D0; Mon,  7 Feb 2005 16:53:17 +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 6F4D316A4CE
	for <perforce@freebsd.org>; Mon,  7 Feb 2005 16:53:17 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5756743D45
	for <perforce@freebsd.org>; Mon,  7 Feb 2005 16:53:17 +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 j17GrHit026533
	for <perforce@freebsd.org>; Mon, 7 Feb 2005 16:53:17 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17GrH2Y026530
	for perforce@freebsd.org; Mon, 7 Feb 2005 16:53:17 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 7 Feb 2005 16:53:17 GMT
Message-Id: <200502071653.j17GrH2Y026530@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 70515 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: Mon, 07 Feb 2005 16:53:18 -0000

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

Change 70515 by jhb@jhb_slimer on 2005/02/07 16:52:24

	Ooops, fix UP kernels in this branch by including spurious_int in
	all kernels.

Affected files ...

.. //depot/projects/smpng/sys/i386/i386/apic_vector.s#11 edit
.. //depot/projects/smpng/sys/i386/i386/exception.s#22 edit

Differences ...

==== //depot/projects/smpng/sys/i386/i386/apic_vector.s#11 (text+ko) ====

@@ -107,6 +107,8 @@
 
 	iret
 
+#ifdef DEV_APIC
+
 	ISR_VEC(1, apic_isr1)
 	ISR_VEC(2, apic_isr2)
 	ISR_VEC(3, apic_isr3)
@@ -357,3 +359,4 @@
 	POP_FRAME
 	iret
 #endif /* SMP */
+#endif /* DEV_APIC */
==== //depot/projects/smpng/sys/i386/i386/exception.s#22 (text+ko) ====

@@ -234,14 +234,12 @@
 
 #include <i386/isa/atpic_vector.s>
 
-#ifdef DEV_APIC
 	.data
 	.p2align 4
 	.text
 	SUPERALIGN_TEXT
 
 #include <i386/i386/apic_vector.s>
-#endif
 
 	.data
 	.p2align 4