From owner-svn-src-all@freebsd.org  Fri Apr 15 15:44:03 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C1502AEDBB9;
 Fri, 15 Apr 2016 15:44:03 +0000 (UTC)
 (envelope-from sgalabov@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 93824101F;
 Fri, 15 Apr 2016 15:44:03 +0000 (UTC)
 (envelope-from sgalabov@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3FFi2mi083510;
 Fri, 15 Apr 2016 15:44:02 GMT (envelope-from sgalabov@FreeBSD.org)
Received: (from sgalabov@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3FFi2O8083508;
 Fri, 15 Apr 2016 15:44:02 GMT (envelope-from sgalabov@FreeBSD.org)
Message-Id: <201604151544.u3FFi2O8083508@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sgalabov set sender to
 sgalabov@FreeBSD.org using -f
From: Stanislav Galabov <sgalabov@FreeBSD.org>
Date: Fri, 15 Apr 2016 15:44:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298065 - in head/sys: conf mips/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Apr 2016 15:44:03 -0000

Author: sgalabov
Date: Fri Apr 15 15:44:02 2016
New Revision: 298065
URL: https://svnweb.freebsd.org/changeset/base/298065

Log:
  Make NIRQ configurable for MIPS
  
  Submitted by:	kan
  Reviewed by:	kan
  Approved by:	adrian (mentor)
  Differential Revision:	https://reviews.freebsd.org/D5964

Modified:
  head/sys/conf/options.mips
  head/sys/mips/include/intr.h

Modified: head/sys/conf/options.mips
==============================================================================
--- head/sys/conf/options.mips	Fri Apr 15 15:42:35 2016	(r298064)
+++ head/sys/conf/options.mips	Fri Apr 15 15:44:02 2016	(r298065)
@@ -145,3 +145,4 @@ PV_STATS		opt_pmap.h
 # Options to use INTRNG code
 #
 MIPS_INTRNG		opt_global.h
+MIPS_NIRQ		opt_global.h

Modified: head/sys/mips/include/intr.h
==============================================================================
--- head/sys/mips/include/intr.h	Fri Apr 15 15:42:35 2016	(r298064)
+++ head/sys/mips/include/intr.h	Fri Apr 15 15:44:02 2016	(r298065)
@@ -47,8 +47,12 @@
 
 #include <sys/intr.h>
 
-#ifndef NIRQ
-#define	NIRQ		128
+#ifndef	MIPS_NIRQ
+#define	MIPS_NIRQ		128
+#endif
+
+#ifndef	NIRQ
+#define	NIRQ			MIPS_NIRQ
 #endif
 
 #define INTR_IRQ_NSPC_SWI	4