From owner-svn-src-head@FreeBSD.ORG  Sun Jan 27 20:16:52 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 55F1BF21;
 Sun, 27 Jan 2013 20:16:52 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4400334D;
 Sun, 27 Jan 2013 20:16:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RKGpGR071528;
 Sun, 27 Jan 2013 20:16:51 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RKGpjw071527;
 Sun, 27 Jan 2013 20:16:51 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201301272016.r0RKGpjw071527@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Sun, 27 Jan 2013 20:16:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246000 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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: Sun, 27 Jan 2013 20:16:52 -0000

Author: ian
Date: Sun Jan 27 20:16:50 2013
New Revision: 246000
URL: http://svnweb.freebsd.org/changeset/base/246000

Log:
  Restore the irq number to the display string; I fumbled this in the previous
  commit while trying to make the code internally self-consistant.
  
  Approved by:	cognet (mentor)
  Obtained from:	Christoph Mallon

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

Modified: head/sys/arm/arm/intr.c
==============================================================================
--- head/sys/arm/arm/intr.c	Sun Jan 27 20:10:29 2013	(r245999)
+++ head/sys/arm/arm/intr.c	Sun Jan 27 20:16:50 2013	(r246000)
@@ -72,9 +72,10 @@ arm_intrnames_init(void)
 {
 	int i;
 
-	for (i = 0; i < NIRQ; ++i)
+	for (i = 0; i < NIRQ; ++i) {
 		snprintf(&intrnames[i * INTRNAME_LEN], INTRNAME_LEN, "%-*s",
 		    INTRNAME_LEN - 1, "");
+	}
 }
 
 void
@@ -94,8 +95,8 @@ arm_setup_irqhandler(const char *name, d
 		if (error)
 			return;
 		intr_events[irq] = event;
-		snprintf(&intrnames[irq * INTRNAME_LEN], INTRNAME_LEN, "%-*s",
-		    INTRNAME_LEN - 1, name);
+		snprintf(&intrnames[irq * INTRNAME_LEN], INTRNAME_LEN, 
+		    "irq%d: %-*s", irq, INTRNAME_LEN - 1, name);
 	}
 	intr_event_add_handler(event, name, filt, hand, arg,
 	    intr_priority(flags), flags, cookiep);