From owner-svn-src-projects@FreeBSD.ORG  Wed Dec 24 15:25:41 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CE046F05;
 Wed, 24 Dec 2014 15:25:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 BA1F1643E2;
 Wed, 24 Dec 2014 15:25:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBOFPfRk086811;
 Wed, 24 Dec 2014 15:25:41 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBOFPfhD086810;
 Wed, 24 Dec 2014 15:25:41 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201412241525.sBOFPfhD086810@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 24 Dec 2014 15:25:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r276181 - projects/arm_intrng/sys/arm/arm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Dec 2014 15:25:41 -0000

Author: andrew
Date: Wed Dec 24 15:25:40 2014
New Revision: 276181
URL: https://svnweb.freebsd.org/changeset/base/276181

Log:
  Support the non-intrng version of arm_setup_irqhandler.

Modified:
  projects/arm_intrng/sys/arm/arm/mp_machdep.c

Modified: projects/arm_intrng/sys/arm/arm/mp_machdep.c
==============================================================================
--- projects/arm_intrng/sys/arm/arm/mp_machdep.c	Wed Dec 24 15:25:18 2014	(r276180)
+++ projects/arm_intrng/sys/arm/arm/mp_machdep.c	Wed Dec 24 15:25:40 2014	(r276181)
@@ -361,9 +361,16 @@ release_aps(void *dummy __unused)
 		 * if we used 0, the intr code will give the trap frame
 		 * pointer instead.
 		 */
+#ifdef ARM_INTRNG
 		arm_setup_irqhandler(NULL, ipi_handler, NULL, (void *)i, i,
 		    INTR_TYPE_MISC | INTR_EXCL | INTR_IPI, NULL);
 		arm_unmask_ipi(i);
+#else
+		arm_setup_irqhandler("ipi", ipi_handler, NULL, (void *)i, i,
+		    INTR_TYPE_MISC | INTR_EXCL, NULL);
+		/* Enable ipi */
+		arm_unmask_irq(i);
+#endif
 	}
 	atomic_store_rel_int(&aps_ready, 1);