svn commit: r249163 - head/sys/kern

[Konstantin Belousov]

Author: kib
Date: Fri Apr  5 14:30:51 2013
New Revision: 249163
URL: http://svnweb.freebsd.org/changeset/base/249163

Log:
  If filter of the interrupt event is not null, print it, in addition to
  the handler address.  Add a mark to distinguish between filter and
  handler.
  
  Note that the arguments for both filter and handler are same.
  
  Sponsored by:	The FreeBSD Foundation
  Reviewed by:	jhb
  MFC after:	1 week

Modified:
  head/sys/kern/kern_intr.c

Modified: head/sys/kern/kern_intr.c
==============================================================================
--- head/sys/kern/kern_intr.c	Fri Apr  5 13:19:30 2013	(r249162)
+++ head/sys/kern/kern_intr.c	Fri Apr  5 14:30:51 2013	(r249163)
@@ -1739,7 +1739,16 @@ db_dump_intrhand(struct intr_handler *ih
 		break;
 	}
 	db_printf(" ");
-	db_printsym((uintptr_t)ih->ih_handler, DB_STGY_PROC);
+	if (ih->ih_filter != NULL) {
+		db_printf("[F]");
+		db_printsym((uintptr_t)ih->ih_filter, DB_STGY_PROC);
+	}
+	if (ih->ih_handler != NULL) {
+		if (ih->ih_filter != NULL)
+			db_printf(",");
+		db_printf("[H]");
+		db_printsym((uintptr_t)ih->ih_handler, DB_STGY_PROC);
+	}
 	db_printf("(%p)", ih->ih_argument);
 	if (ih->ih_need ||
 	    (ih->ih_flags & (IH_EXCLUSIVE | IH_ENTROPY | IH_DEAD |