evcnt & friends were replaced by a proper interrupt counting mechanism 3 years ago; ok miod

2 files changed, 2 insertions, 13 deletions

diff --git a/sys/arch/sh/include/intr.h b/sys/arch/sh/include/intr.h
index 283dc96bc60..6fdf1e7caf8 100644
--- a/sys/arch/sh/include/intr.h
+++ b/sys/arch/sh/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.2 2006/10/23 19:44:54 drahn Exp $	*/
+/*	$OpenBSD: intr.h,v 1.3 2007/05/10 17:59:26 deraadt Exp $	*/
 /*	$NetBSD: intr.h,v 1.22 2006/01/24 23:51:42 uwe Exp $	*/
 
 /*-
@@ -108,7 +108,6 @@ struct sh_soft_intrhand {
 
 struct sh_soft_intr {
 	TAILQ_HEAD(, sh_soft_intrhand) softintr_q;
-	struct evcnt softintr_evcnt;
 	struct simplelock softintr_slock;
 	unsigned long softintr_ipl;
 };
diff --git a/sys/arch/sh/sh/interrupt.c b/sys/arch/sh/sh/interrupt.c
index 93a557634b7..bd6dc40a4d7 100644
--- a/sys/arch/sh/sh/interrupt.c
+++ b/sys/arch/sh/sh/interrupt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interrupt.c,v 1.4 2006/11/05 18:58:50 miod Exp $	*/
+/*	$OpenBSD: interrupt.c,v 1.5 2007/05/10 17:59:26 deraadt Exp $	*/
 /*	$NetBSD: interrupt.c,v 1.18 2006/01/25 00:02:57 uwe Exp $	*/
 
 /*-
@@ -578,9 +578,6 @@ intpri_intr_disable(int evtcode)
 void
 softintr_init(void)
 {
-#if 0
-	static const char *softintr_names[] = IPL_SOFTNAMES;
-#endif
 	struct sh_soft_intr *asi;
 	int i;
 
@@ -590,10 +587,6 @@ softintr_init(void)
 
 		asi->softintr_ipl = IPL_SOFT + i;
 		simple_lock_init(&asi->softintr_slock);
-#if 0
-		evcnt_attach_dynamic(&asi->softintr_evcnt, EVCNT_TYPE_INTR,
-		    NULL, "soft", softintr_names[i]);
-#endif
 	}
 
 	/* XXX Establish legacy soft interrupt handlers. */
@@ -618,9 +611,6 @@ softintr_dispatch(int ipl)
 
 	asi = &sh_soft_intrs[ipl - IPL_SOFT];
 
-	if (TAILQ_FIRST(&asi->softintr_q) != NULL)
-		asi->softintr_evcnt.ev_count++;
-
 	while ((sih = TAILQ_FIRST(&asi->softintr_q)) != NULL) {
 		TAILQ_REMOVE(&asi->softintr_q, sih, sih_q);
 		sih->sih_pending = 0;