From owner-svn-src-head@FreeBSD.ORG  Wed Aug  6 21:27:16 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 89DA3C72
 for <svn-src-head@freebsd.org>; Wed,  6 Aug 2014 21:27:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6012F29AC
 for <svn-src-head@freebsd.org>; Wed,  6 Aug 2014 21:27:16 +0000 (UTC)
Received: from ian (uid 1311) (envelope-from ian@FreeBSD.org) id 5f39
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Wed, 06 Aug 2014 21:27:16 +0000
From: Ian Lepore <ian@FreeBSD.org>
Date: Wed, 6 Aug 2014 21:27:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269646 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e29db4.5f39.275b0c5a@svn.freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Aug 2014 21:27:16 -0000

Author: ian
Date: Wed Aug  6 21:27:15 2014
New Revision: 269646
URL: http://svnweb.freebsd.org/changeset/base/269646

Log:
  Use a SYSINIT to init the array of interrupt names on arm.  This was
  called from initarm() in arm/machdep.c, but many legacy arm platforms
  have their own private initarm(), so a SYSINIT fixes everyone.
  
  Reported by:	jmg

Modified:
  head/sys/arm/arm/intr.c
  head/sys/arm/arm/machdep.c

Modified: head/sys/arm/arm/intr.c
==============================================================================
--- head/sys/arm/arm/intr.c	Wed Aug  6 21:16:15 2014	(r269645)
+++ head/sys/arm/arm/intr.c	Wed Aug  6 21:27:15 2014	(r269646)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
@@ -75,8 +76,8 @@ size_t sintrnames = sizeof(intrnames);
  * assumptions of vmstat(8) and the kdb "show intrcnt" command, the two
  * consumers of this data.
  */
-void
-arm_intrnames_init(void)
+static void
+intr_init(void *unused)
 {
 	int i;
 
@@ -86,6 +87,8 @@ arm_intrnames_init(void)
 	}
 }
 
+SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL);
+
 void
 arm_setup_irqhandler(const char *name, driver_filter_t *filt,
     void (*hand)(void*), void *arg, int irq, int flags, void **cookiep)

Modified: head/sys/arm/arm/machdep.c
==============================================================================
--- head/sys/arm/arm/machdep.c	Wed Aug  6 21:16:15 2014	(r269645)
+++ head/sys/arm/arm/machdep.c	Wed Aug  6 21:27:15 2014	(r269646)
@@ -1278,7 +1278,6 @@ initarm(struct arm_boot_params *abp)
 
 	init_proc0(kernelstack.pv_va);
 
-	arm_intrnames_init();
 	arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL);
 	pmap_bootstrap(freemempos, &kernel_l1pt);
 	msgbufp = (void *)msgbufpv.pv_va;