diff --git a/sys/arch/x86/x86/intr.c b/sys/arch/x86/x86/intr.c
index 810b1dc5814f..52c27e14caa0 100644
--- a/sys/arch/x86/x86/intr.c
+++ b/sys/arch/x86/x86/intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.45 2008/04/28 22:47:37 ad Exp $	*/
+/*	$NetBSD: intr.c,v 1.46 2008/04/28 23:00:22 ad Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.45 2008/04/28 22:47:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.46 2008/04/28 23:00:22 ad Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_acpi.h"
@@ -940,7 +940,7 @@ cpu_intr_init(struct cpu_info *ci)
 	isp->is_handlers = &fake_timer_intrhand;
 	isp->is_pic = &local_pic;
 	ci->ci_isources[LIR_TIMER] = isp;
-	evcnt_attach_dynamic(&isp->is_evcnt, EVCNT_TYPE_INTR, NULL,
+	evcnt_attach_dynamic(&isp->is_evcnt, EVCNT_TYPE_MISC, NULL,
 	    device_xname(ci->ci_dev), "timer");
 
 #ifdef MULTIPROCESSOR
@@ -956,7 +956,7 @@ cpu_intr_init(struct cpu_info *ci)
 	ci->ci_isources[LIR_IPI] = isp;
 
 	for (i = 0; i < X86_NIPI; i++)
-		evcnt_attach_dynamic(&ci->ci_ipi_events[i], EVCNT_TYPE_INTR,
+		evcnt_attach_dynamic(&ci->ci_ipi_events[i], EVCNT_TYPE_MISC,
 		    NULL, device_xname(ci->ci_dev), x86_ipi_names[i]);
 #endif
 #endif
diff --git a/sys/arch/x86/x86/pmap.c b/sys/arch/x86/x86/pmap.c
index f664d050d7ec..a071c0ff53f9 100644
--- a/sys/arch/x86/x86/pmap.c
+++ b/sys/arch/x86/x86/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.54 2008/04/28 17:18:19 ad Exp $	*/
+/*	$NetBSD: pmap.c,v 1.55 2008/04/28 23:00:22 ad Exp $	*/
 
 /*
  * Copyright (c) 2007 Manuel Bouyer.
@@ -154,7 +154,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.54 2008/04/28 17:18:19 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.55 2008/04/28 23:00:22 ad Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -1610,9 +1610,9 @@ pmap_cpu_init_late(struct cpu_info *ci)
 {
 
 	if (ci == &cpu_info_primary)
-		evcnt_attach_dynamic(&pmap_tlb_evcnt, EVCNT_TYPE_INTR,
+		evcnt_attach_dynamic(&pmap_tlb_evcnt, EVCNT_TYPE_IPI,
 		    NULL, "global", "TLB IPI");
-	evcnt_attach_dynamic(&ci->ci_tlb_evcnt, EVCNT_TYPE_INTR,
+	evcnt_attach_dynamic(&ci->ci_tlb_evcnt, EVCNT_TYPE_MISC,
 	    NULL, device_xname(ci->ci_dev), "TLB IPI");
 }
 
diff --git a/sys/kern/kern_softint.c b/sys/kern/kern_softint.c
index 12d87e90b2c8..05b8485f16a8 100644
--- a/sys/kern/kern_softint.c
+++ b/sys/kern/kern_softint.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_softint.c,v 1.19 2008/04/28 21:17:16 ad Exp $	*/
+/*	$NetBSD: kern_softint.c,v 1.20 2008/04/28 23:00:22 ad Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -176,7 +176,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.19 2008/04/28 21:17:16 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.20 2008/04/28 23:00:22 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -253,11 +253,11 @@ softint_init_isr(softcpu_t *sc, const char *desc, pri_t pri, u_int level)
 
 	snprintf(si->si_name, sizeof(si->si_name), "%s/%u", desc,
 	    ci->ci_index);
-	evcnt_attach_dynamic(&si->si_evcnt, EVCNT_TYPE_INTR, NULL,
+	evcnt_attach_dynamic(&si->si_evcnt, EVCNT_TYPE_MISC, NULL,
 	   "softint", si->si_name);
 	snprintf(si->si_name_block, sizeof(si->si_name_block), "%s block/%u",
 	    desc, ci->ci_index);
-	evcnt_attach_dynamic(&si->si_evcnt_block, EVCNT_TYPE_INTR, NULL,
+	evcnt_attach_dynamic(&si->si_evcnt_block, EVCNT_TYPE_MISC, NULL,
 	   "softint", si->si_name_block);
 
 	si->si_lwp->l_private = si;