From owner-svn-src-all@FreeBSD.ORG  Fri Jul  2 17:22:16 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 04E55106566C;
	Fri,  2 Jul 2010 17:22:16 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E86D28FC13;
	Fri,  2 Jul 2010 17:22:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o62HMFCR057511;
	Fri, 2 Jul 2010 17:22:15 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o62HMFTs057508;
	Fri, 2 Jul 2010 17:22:15 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201007021722.o62HMFTs057508@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 2 Jul 2010 17:22:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209649 - in head/sys: amd64/amd64 i386/i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jul 2010 17:22:16 -0000

Author: mav
Date: Fri Jul  2 17:22:15 2010
New Revision: 209649
URL: http://svn.freebsd.org/changeset/base/209649

Log:
  Revert r209638. After commit, there appeared to be more people who liked
  previous name of stray interrupt counters, then responded to the list.

Modified:
  head/sys/amd64/amd64/intr_machdep.c
  head/sys/i386/i386/intr_machdep.c

Modified: head/sys/amd64/amd64/intr_machdep.c
==============================================================================
--- head/sys/amd64/amd64/intr_machdep.c	Fri Jul  2 15:50:30 2010	(r209648)
+++ head/sys/amd64/amd64/intr_machdep.c	Fri Jul  2 17:22:15 2010	(r209649)
@@ -346,8 +346,8 @@ intrcnt_register(struct intsrc *is)
 	mtx_lock_spin(&intrcnt_lock);
 	is->is_index = intrcnt_index;
 	intrcnt_index += 2;
-	snprintf(straystr, MAXCOMLEN + 1, "%s stray",
-	    is->is_event->ie_name);
+	snprintf(straystr, MAXCOMLEN + 1, "stray irq%d",
+	    is->is_pic->pic_vector(is));
 	intrcnt_updatename(is);
 	is->is_count = &intrcnt[is->is_index];
 	intrcnt_setname(straystr, is->is_index + 1);

Modified: head/sys/i386/i386/intr_machdep.c
==============================================================================
--- head/sys/i386/i386/intr_machdep.c	Fri Jul  2 15:50:30 2010	(r209648)
+++ head/sys/i386/i386/intr_machdep.c	Fri Jul  2 17:22:15 2010	(r209649)
@@ -334,8 +334,8 @@ intrcnt_register(struct intsrc *is)
 	mtx_lock_spin(&intrcnt_lock);
 	is->is_index = intrcnt_index;
 	intrcnt_index += 2;
-	snprintf(straystr, MAXCOMLEN + 1, "%s stray",
-	    is->is_event->ie_name);
+	snprintf(straystr, MAXCOMLEN + 1, "stray irq%d",
+	    is->is_pic->pic_vector(is));
 	intrcnt_updatename(is);
 	is->is_count = &intrcnt[is->is_index];
 	intrcnt_setname(straystr, is->is_index + 1);