From owner-p4-projects@FreeBSD.ORG  Fri Dec  5 18:35:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B0FF11065688; Fri,  5 Dec 2008 18:35:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 74948106567D
	for <perforce@freebsd.org>; Fri,  5 Dec 2008 18:35:35 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 644628FC08
	for <perforce@freebsd.org>; Fri,  5 Dec 2008 18:35:35 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB5IZZ8f021288
	for <perforce@freebsd.org>; Fri, 5 Dec 2008 18:35:35 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB5IZZTu021286
	for perforce@freebsd.org; Fri, 5 Dec 2008 18:35:35 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 5 Dec 2008 18:35:35 GMT
Message-Id: <200812051835.mB5IZZTu021286@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154126 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 05 Dec 2008 18:35:35 -0000

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

Change 154126 by sam@sam_ebb on 2008/12/05 18:34:45

	hack NIRQ issue for now; fixing this right requires more time
	than I've got right now

Affected files ...

.. //depot/projects/vap/sys/arm/include/intr.h#10 edit

Differences ...

==== //depot/projects/vap/sys/arm/include/intr.h#10 (text+ko) ====

@@ -39,6 +39,7 @@
 #ifndef _MACHINE_INTR_H_
 #define _MACHINE_INTR_H_
 
+/* XXX move to std.* files? */
 #ifdef CPU_XSCALE_81342
 #define NIRQ		128
 #elif defined(CPU_XSCALE_PXA2X0)
@@ -46,7 +47,8 @@
 #define	NIRQ		IRQ_GPIO_MAX
 #elif defined(SOC_MV_DISCOVERY)
 #define NIRQ		96
-#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD)
+#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD) || \
+    defined(CPU_XSCALE_IXP435)
 #define NIRQ		64
 #else
 #define NIRQ		32