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

[Alexander Motin]

Author: mav
Date: Thu Jul  1 21:58:46 2010
New Revision: 209638
URL: http://svn.freebsd.org/changeset/base/209638

Log:
  Make stray irq counters have format alike to other counters. Unified format
  makes string processing (for example by `systat -vm`) easier.

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	Thu Jul  1 21:03:30 2010	(r209637)
+++ head/sys/amd64/amd64/intr_machdep.c	Thu Jul  1 21:58:46 2010	(r209638)
@@ -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, "stray irq%d",
-	    is->is_pic->pic_vector(is));
+	snprintf(straystr, MAXCOMLEN + 1, "%s stray",
+	    is->is_event->ie_name);
 	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	Thu Jul  1 21:03:30 2010	(r209637)
+++ head/sys/i386/i386/intr_machdep.c	Thu Jul  1 21:58:46 2010	(r209638)
@@ -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, "stray irq%d",
-	    is->is_pic->pic_vector(is));
+	snprintf(straystr, MAXCOMLEN + 1, "%s stray",
+	    is->is_event->ie_name);
 	intrcnt_updatename(is);
 	is->is_count = &intrcnt[is->is_index];
 	intrcnt_setname(straystr, is->is_index + 1);