From owner-p4-projects@FreeBSD.ORG  Wed Dec 22 20:24:59 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9FCAE16A4D0; Wed, 22 Dec 2004 20:24:58 +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 6025416A4CE
	for <perforce@freebsd.org>; Wed, 22 Dec 2004 20:24:58 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4E3BD43D5D
	for <perforce@freebsd.org>; Wed, 22 Dec 2004 20:24:58 +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 iBMKOwRZ068703
	for <perforce@freebsd.org>; Wed, 22 Dec 2004 20:24:58 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBMKOwh4068700
	for perforce@freebsd.org; Wed, 22 Dec 2004 20:24:58 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 22 Dec 2004 20:24:58 GMT
Message-Id: <200412222024.iBMKOwh4068700@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 67551 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: Wed, 22 Dec 2004 20:24:59 -0000

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

Change 67551 by jhb@jhb_twclab on 2004/12/22 20:24:10

	Fixup assertions.

Affected files ...

.. //depot/projects/smpng/sys/i386/i386/local_apic.c#20 edit
.. //depot/user/jhb/clock/i386/i386/local_apic.c#35 edit

Differences ...

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

@@ -60,7 +60,8 @@
 #define	MAX_APICID	16
 
 /* Sanity checks on IDT vectors. */
-CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_LOCAL_INTS);
+CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT);
+CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS);
 CTASSERT(APIC_LOCAL_INTS == 240);
 CTASSERT(IPI_STOP < APIC_SPURIOUS_INT);
 

==== //depot/user/jhb/clock/i386/i386/local_apic.c#35 (text+ko) ====

@@ -60,7 +60,8 @@
 #define	MAX_APICID	16
 
 /* Sanity checks on IDT vectors. */
-CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_LOCAL_INTS);
+CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT);
+CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS);
 CTASSERT(APIC_LOCAL_INTS == 240);
 CTASSERT(IPI_STOP < APIC_SPURIOUS_INT);