svn commit: r209649 - in head/sys: amd64/amd64 i386/i386

[Alexander Motin]

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);