From owner-p4-projects@FreeBSD.ORG  Fri Nov 14 11:42:40 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0CB4C16A4D0; Fri, 14 Nov 2003 11:42:40 -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 D8CA516A4CE
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 11:42:39 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 43D7043FDF
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 11:42:39 -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 hAEJgdXJ062123
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 11:42:39 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAEJgcnP062120
	for perforce@freebsd.org; Fri, 14 Nov 2003 11:42:38 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Fri, 14 Nov 2003 11:42:38 -0800 (PST)
Message-Id: <200311141942.hAEJgcnP062120@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 42365 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 19:42:40 -0000

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

Change 42365 by peter@peter_daintree on 2003/11/14 11:41:57

	fix merge-o

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/apicvar.h#13 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/include/apicvar.h#13 (text+ko) ====

@@ -80,7 +80,7 @@
  */
 
 #define	APIC_ID_ALL	0xff
-#define	APIC_NUM_IOINTS	(IDT_IO_INTS + 16)
+#define	APIC_IO_INTS	(IDT_IO_INTS + 16)
 #define	APIC_NUM_IOINTS	192
 
 #define	APIC_LOCAL_INTS	240