Use new event counter API for interrupt counting on alpha. By me, with some

edits by Theo.  deraadt@ ok

13 files changed, 20 insertions, 200 deletions

diff --git a/sys/arch/alpha/pci/pci_1000.c b/sys/arch/alpha/pci/pci_1000.c
index 3d5ae2e63a7..430aae9421c 100644
--- a/sys/arch/alpha/pci/pci_1000.c
+++ b/sys/arch/alpha/pci/pci_1000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_1000.c,v 1.1 2002/06/30 16:24:40 miod Exp $ */
+/* $OpenBSD: pci_1000.c,v 1.2 2004/06/28 02:28:42 aaron Exp $ */
 /* $NetBSD: pci_1000.c,v 1.12 2001/07/27 00:25:20 thorpej Exp $ */
 
 /*
@@ -94,9 +94,6 @@ static bus_space_handle_t another_mystery_icu_ioh;
 int	dec_1000_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
 const char *dec_1000_intr_string(void *, pci_intr_handle_t);
 int	dec_1000_intr_line(void *, pci_intr_handle_t);
-#if 0
-const struct evcnt *dec_1000_intr_evcnt(void *, pci_intr_handle_t);
-#endif
 void	*dec_1000_intr_establish(void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *);
 void	dec_1000_intr_disestablish(void *, void *);
@@ -132,9 +129,6 @@ pci_1000_pickintr(core, iot, memt, pc)
         pc->pc_intr_map = dec_1000_intr_map;
         pc->pc_intr_string = dec_1000_intr_string;
 	pc->pc_intr_line = dec_1000_intr_line;
-#if 0
-	pc->pc_intr_evcnt = dec_1000_intr_evcnt;
-#endif
         pc->pc_intr_establish = dec_1000_intr_establish;
         pc->pc_intr_disestablish = dec_1000_intr_disestablish;
 
@@ -146,14 +140,6 @@ pci_1000_pickintr(core, iot, memt, pc)
 	for (i = 0; i < PCI_NIRQ; i++) {
 		alpha_shared_intr_set_maxstrays(dec_1000_pci_intr, i,
 		    PCI_STRAY_MAX);
-		
-#if 0
-		cp = alpha_shared_intr_string(dec_1000_pci_intr, i);
-		sprintf(cp, "irq %d", i);
-		evcnt_attach_dynamic(alpha_shared_intr_evcnt(
-		    dec_1000_pci_intr, i), EVCNT_TYPE_INTR, NULL,
-		    "dec_1000", cp);
-#endif
 	}
 
 	pci_1000_imi();
@@ -223,20 +209,6 @@ dec_1000_intr_line(ccv, ih)
 #endif
 }
 
-#if 0
-const struct evcnt *
-dec_1000_intr_evcnt(ccv, ih)
-	void *ccv;
-	pci_intr_handle_t ih;
-{
-
-	if (ih >= PCI_NIRQ)
-		panic("dec_1000_intr_evcnt: bogus dec_1000 IRQ 0x%lx", ih);
-
-	return (alpha_shared_intr_evcnt(dec_1000_pci_intr, ih));
-}
-#endif
-
 void *
 dec_1000_intr_establish(ccv, ih, level, func, arg, name)
         void *ccv;
diff --git a/sys/arch/alpha/pci/pci_1000a.c b/sys/arch/alpha/pci/pci_1000a.c
index 5392264f46d..0579b368bed 100644
--- a/sys/arch/alpha/pci/pci_1000a.c
+++ b/sys/arch/alpha/pci/pci_1000a.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_1000a.c,v 1.1 2002/06/30 16:24:40 miod Exp $ */
+/* $OpenBSD: pci_1000a.c,v 1.2 2004/06/28 02:28:42 aaron Exp $ */
 /* $NetBSD: pci_1000a.c,v 1.14 2001/07/27 00:25:20 thorpej Exp $ */
 
 /*
@@ -101,9 +101,6 @@ int	dec_1000a_intr_map(void *, pcitag_t, int, int,
 	    pci_intr_handle_t *);
 const char *dec_1000a_intr_string(void *, pci_intr_handle_t);
 int	dec_1000a_intr_line(void *, pci_intr_handle_t);
-#if 0
-const struct evcnt *dec_1000a_intr_evcnt(void *, pci_intr_handle_t);
-#endif
 void	*dec_1000a_intr_establish(void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *);
 void	dec_1000a_intr_disestablish(void *, void *);
@@ -137,9 +134,6 @@ pci_1000a_pickintr(core, iot, memt, pc)
         pc->pc_intr_map = dec_1000a_intr_map;
         pc->pc_intr_string = dec_1000a_intr_string;
 	pc->pc_intr_line = dec_1000a_intr_line;
-#if 0
-	pc->pc_intr_evcnt = dec_1000a_intr_evcnt;
-#endif
         pc->pc_intr_establish = dec_1000a_intr_establish;
         pc->pc_intr_disestablish = dec_1000a_intr_disestablish;
 
@@ -150,14 +144,6 @@ pci_1000a_pickintr(core, iot, memt, pc)
 	for (i = 0; i < PCI_NIRQ; i++) {
 		alpha_shared_intr_set_maxstrays(dec_1000a_pci_intr, i,
 		    PCI_STRAY_MAX);
-
-#if 0
-		cp = alpha_shared_intr_string(dec_1000a_pci_intr, i);
-		sprintf(cp, "irq %d", i);
-		evcnt_attach_dynamic(alpha_shared_intr_evcnt(
-		    dec_1000a_pci_intr, i), EVCNT_TYPE_INTR, NULL,
-		    "dec_1000a", cp);
-#endif
 	}
 
 	pci_1000a_imi();
@@ -244,20 +230,6 @@ dec_1000a_intr_line(ccv, ih)
 #endif
 }
 
-#if 0
-const struct evcnt *
-dec_1000a_intr_evcnt(ccv, ih)
-	void *ccv;
-	pci_intr_handle_t ih;
-{
-
-	if (ih >= PCI_NIRQ)
-		panic("dec_1000a_intr_evcnt: bogus dec_1000a IRQ 0x%lx", ih);
-
-	return (alpha_shared_intr_evcnt(dec_1000a_pci_intr, ih));
-}
-#endif
-
 void *
 dec_1000a_intr_establish(ccv, ih, level, func, arg, name)
         void *ccv;
diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c
index e7046bab335..1fc437e9f02 100644
--- a/sys/arch/alpha/pci/pci_550.c
+++ b/sys/arch/alpha/pci/pci_550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_550.c,v 1.11 2003/05/11 19:41:09 deraadt Exp $ */
+/* $OpenBSD: pci_550.c,v 1.12 2004/06/28 02:28:43 aaron Exp $ */
 /* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */
 
 /*-
@@ -98,7 +98,6 @@ int	dec_550_intr_map(void *, pcitag_t, int, int,
 	    pci_intr_handle_t *);
 const char *dec_550_intr_string(void *, pci_intr_handle_t);
 int	dec_550_intr_line(void *, pci_intr_handle_t);
-const struct evcnt *dec_550_intr_evcnt(void *, pci_intr_handle_t);
 void	*dec_550_intr_establish(void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *);
 void	dec_550_intr_disestablish(void *, void *);
@@ -147,9 +146,6 @@ pci_550_pickintr(ccp)
         pc->pc_intr_map = dec_550_intr_map;
         pc->pc_intr_string = dec_550_intr_string;
         pc->pc_intr_line = dec_550_intr_line;
-#if 0
-	pc->pc_intr_evcnt = dec_550_intr_evcnt;
-#endif
         pc->pc_intr_establish = dec_550_intr_establish;
         pc->pc_intr_disestablish = dec_550_intr_disestablish;
 
@@ -171,13 +167,6 @@ pci_550_pickintr(ccp)
 		alpha_shared_intr_set_maxstrays(dec_550_pci_intr, i,
 		    PCI_STRAY_MAX);
 		alpha_shared_intr_set_private(dec_550_pci_intr, i, ccp);
-#if 0		
-		cp = alpha_shared_intr_string(dec_550_pci_intr, i);
-		sprintf(cp, "irq %d", i);
-		evcnt_attach_dynamic(alpha_shared_intr_evcnt(
-		    dec_550_pci_intr, i), EVCNT_TYPE_INTR, NULL,
-		    "dec_550", cp);
-#endif
 	}
 
 #if NSIO
@@ -303,29 +292,6 @@ dec_550_intr_line(ccv, ih)
 	return (ih);
 }
 
-#if 0
-const struct evcnt *
-dec_550_intr_evcnt(ccv, ih)
-	void *ccv;
-	pci_intr_handle_t ih;
-{
-#if 0
-	struct cia_config *ccp = ccv;
-#endif
-
-#if NSIO
-	if (DEC_550_LINE_IS_ISA(ih))
-		return (sio_intr_evcnt(NULL /*XXX*/,
-		    DEC_550_LINE_ISA_IRQ(ih)));
-#endif
-
-	if (ih >= DEC_550_MAX_IRQ)
-		panic("dec_550_intr_evcnt: bogus 550 IRQ 0x%lx", ih);
-
-	return (alpha_shared_intr_evcnt(dec_550_pci_intr, ih));
-}
-#endif
-
 void *
 dec_550_intr_establish(ccv, ih, level, func, arg, name)
 	void *ccv, *arg;
diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c
index f98f7cb7079..0bb50fe4afd 100644
--- a/sys/arch/alpha/pci/pci_6600.c
+++ b/sys/arch/alpha/pci/pci_6600.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_6600.c,v 1.10 2002/06/25 21:33:21 miod Exp $ */
+/* $OpenBSD: pci_6600.c,v 1.11 2004/06/28 02:28:43 aaron Exp $ */
 /* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -81,7 +81,6 @@ void *dec_6600_intr_establish(void *, pci_intr_handle_t, int,
     int (*func)(void *), void *, char *);
 const char *dec_6600_intr_string(void *, pci_intr_handle_t);
 int dec_6600_intr_line(void *, pci_intr_handle_t);
-const struct evcnt *dec_6600_intr_evcnt(void *, pci_intr_handle_t);
 int dec_6600_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
 void *dec_6600_pciide_compat_intr_establish(void *, struct device *,
     struct pci_attach_args *, int, int (*)(void *), void *);
@@ -108,9 +107,6 @@ pci_6600_pickintr(pcp)
         pc->pc_intr_map = dec_6600_intr_map;
         pc->pc_intr_string = dec_6600_intr_string;
         pc->pc_intr_line = dec_6600_intr_line;
-#if 0
-	pc->pc_intr_evcnt = dec_6600_intr_evcnt;
-#endif
         pc->pc_intr_establish = dec_6600_intr_establish;
         pc->pc_intr_disestablish = dec_6600_intr_disestablish;
 	pc->pc_pciide_compat_intr_establish = NULL;
@@ -128,14 +124,6 @@ pci_6600_pickintr(pcp)
 			    PCI_STRAY_MAX);
 			alpha_shared_intr_set_private(dec_6600_pci_intr, i,
 			    sioprimary);
-
-#if 0
-			cp = alpha_shared_intr_string(dec_6600_pci_intr);
-			sprintf(cp, "irq %d", i);
-			evcnt_attach_dynamic(alpha_shared_intr_evcnt(
-			    dec_6600_pci_intr, 1), EVCNT_TYPE_INTR, NULL,
-			    "dec_6600", cp);
-#endif
 		}
 #if NSIO
 		sio_intr_setup(pc, iot);
@@ -199,7 +187,7 @@ dec_6600_intr_string(acv, ih)
 	pci_intr_handle_t ih;
 {
 
-	static const char irqfmt[] = "dec 6600 irq %ld";
+	static const char irqfmt[] = "%lddec6600";
 	static char irqstr[sizeof irqfmt];
 
 #if NSIO
@@ -227,23 +215,6 @@ dec_6600_intr_line(acv, ih)
 	return (ih);
 }
 
-#if 0
-const struct evcnt *
-dec_6600_intr_evcnt(acv, ih)
-	void *acv;
-	pci_intr_handle_t ih;
-{
-
-#if NSIO
-	if (DEC_6600_LINE_IS_ISA(ih))
-		return (sio_intr_evcnt(NULL /*XXX*/,
-		    DEC_6600_LINE_ISA_IRQ(ih)));
-#endif
-
-	return (alpha_shared_intr_evcnt(dec_6600_pci_intr, ih));
-}
-#endif
-
 void *
 dec_6600_intr_establish(acv, ih, level, func, arg, name)
         void *acv, *arg;
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index 8be7804db6e..5aec27d2658 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb164.c,v 1.15 2003/05/10 21:11:12 deraadt Exp $ */
+/* $OpenBSD: pci_eb164.c,v 1.16 2004/06/28 02:28:43 aaron Exp $ */
 /* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -98,7 +98,6 @@ int	dec_eb164_intr_map(void *, pcitag_t, int, int,
 	    pci_intr_handle_t *);
 const char *dec_eb164_intr_string(void *, pci_intr_handle_t);
 int	dec_eb164_intr_line(void *, pci_intr_handle_t);
-const struct evcnt *dec_eb164_intr_evcnt(void *, pci_intr_handle_t);
 void	*dec_eb164_intr_establish(void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *);
 void	dec_eb164_intr_disestablish(void *, void *);
diff --git a/sys/arch/alpha/pci/pci_eb164.h b/sys/arch/alpha/pci/pci_eb164.h
index 71521177906..617ad4e37e4 100644
--- a/sys/arch/alpha/pci/pci_eb164.h
+++ b/sys/arch/alpha/pci/pci_eb164.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_eb164.h,v 1.3 2002/03/14 01:26:27 millert Exp $	*/
+/*	$OpenBSD: pci_eb164.h,v 1.4 2004/06/28 02:28:43 aaron Exp $	*/
 /*	$NetBSD: pci_eb164.h,v 1.1 1996/11/11 21:08:13 cgd Exp $	*/
 
 /*
@@ -29,7 +29,3 @@
  */
 
 void	pci_eb164_pickintr(struct cia_config *);
-
-#ifdef EVCNT_COUNTERS
-extern struct evcnt eb164_intr_evcnt;
-#endif
diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c
index 8589bb87452..a4857570e98 100644
--- a/sys/arch/alpha/pci/pci_eb64plus.c
+++ b/sys/arch/alpha/pci/pci_eb64plus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb64plus.c,v 1.5 2003/05/10 21:11:12 deraadt Exp $ */
+/* $OpenBSD: pci_eb64plus.c,v 1.6 2004/06/28 02:28:43 aaron Exp $ */
 /* $NetBSD: pci_eb64plus.c,v 1.10 2001/07/27 00:25:20 thorpej Exp $ */
 
 /*-
@@ -94,7 +94,6 @@
 int	dec_eb64plus_intr_map(void *, pcitag_t, int, int,
 	    pci_intr_handle_t *);
 const char *dec_eb64plus_intr_string(void *, pci_intr_handle_t);
-const struct evcnt *dec_eb64plus_intr_evcnt(void *, pci_intr_handle_t);
 void	*dec_eb64plus_intr_establish(void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *);
 void	dec_eb64plus_intr_disestablish(void *, void *);
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index dec0ee5bd47..ba6eb7fd1cc 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_kn20aa.c,v 1.19 2003/05/10 21:11:12 deraadt Exp $	*/
+/*	$OpenBSD: pci_kn20aa.c,v 1.20 2004/06/28 02:28:43 aaron Exp $	*/
 /*	$NetBSD: pci_kn20aa.c,v 1.21 1996/11/17 02:05:27 cgd Exp $	*/
 
 /*
@@ -49,10 +49,6 @@
 
 #include <alpha/pci/pci_kn20aa.h>
 
-#ifndef EVCNT_COUNTERS
-#include <machine/intrcnt.h>
-#endif
-
 #include "sio.h"
 #if NSIO
 #include <alpha/pci/siovar.h>
@@ -71,9 +67,7 @@ void	dec_kn20aa_intr_disestablish(void *, void *);
 #define	PCI_STRAY_MAX	5
 
 struct alpha_shared_intr *kn20aa_pci_intr;
-#ifdef EVCNT_COUNTERS
-struct evcnt kn20aa_intr_evcnt;
-#endif
+struct evcount kn20aa_intr_count;
 
 void	kn20aa_iointr(void *framep, unsigned long vec);
 void	kn20aa_enable_intr(int irq);
@@ -255,13 +249,7 @@ kn20aa_iointr(framep, vec)
 			panic("kn20aa_iointr: vec 0x%x out of range", vec);
 		irq = (vec - 0x900) >> 4;
 
-#ifdef EVCNT_COUNTERS
-		kn20aa_intr_evcnt.ev_count++;
-#else
-		if (KN20AA_MAX_IRQ != INTRCNT_KN20AA_IRQ_LEN)
-			panic("kn20aa interrupt counter sizes inconsistent");
-		intrcnt[INTRCNT_KN20AA_IRQ + irq]++;
-#endif
+		kn20aa_intr_count.ec_count++;
 
 		if (!alpha_shared_intr_dispatch(kn20aa_pci_intr, irq)) {
 			alpha_shared_intr_stray(kn20aa_pci_intr, irq,
diff --git a/sys/arch/alpha/pci/pci_kn20aa.h b/sys/arch/alpha/pci/pci_kn20aa.h
index 8f656d4406e..b96b9fe7db9 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.h
+++ b/sys/arch/alpha/pci/pci_kn20aa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_kn20aa.h,v 1.5 2002/03/14 01:26:27 millert Exp $	*/
+/*	$OpenBSD: pci_kn20aa.h,v 1.6 2004/06/28 02:28:43 aaron Exp $	*/
 /*	$NetBSD: pci_kn20aa.h,v 1.2 1996/04/13 00:24:35 cgd Exp $	*/
 
 /*
@@ -29,7 +29,3 @@
  */
 
 void	pci_kn20aa_pickintr(struct cia_config *);
-
-#ifdef EVCNT_COUNTERS
-extern struct evcnt kn20aa_intr_evcnt;
-#endif
diff --git a/sys/arch/alpha/pci/pci_up1000.c b/sys/arch/alpha/pci/pci_up1000.c
index d615581988d..6fe070eacd9 100644
--- a/sys/arch/alpha/pci/pci_up1000.c
+++ b/sys/arch/alpha/pci/pci_up1000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_up1000.c,v 1.7 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: pci_up1000.c,v 1.8 2004/06/28 02:28:43 aaron Exp $	*/
 /* $NetBSD: pci_up1000.c,v 1.6 2000/12/28 22:59:07 sommerfeld Exp $ */
 
 /*-
@@ -68,7 +68,6 @@
 int     api_up1000_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
 const char *api_up1000_intr_string(void *, pci_intr_handle_t);
 int	api_up1000_intr_line(void *, pci_intr_handle_t);
-const struct evcnt *api_up1000_intr_evcnt(void *, pci_intr_handle_t);
 void    *api_up1000_intr_establish(void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *);
 void    api_up1000_intr_disestablish(void *, void *);
@@ -87,9 +86,6 @@ pci_up1000_pickintr(struct irongate_config *icp)
 	pc->pc_intr_map = api_up1000_intr_map;
 	pc->pc_intr_string = api_up1000_intr_string;
 	pc->pc_intr_line = api_up1000_intr_line;
-#if 0
-	pc->pc_intr_evcnt = api_up1000_intr_evcnt;
-#endif
 	pc->pc_intr_establish = api_up1000_intr_establish;
 	pc->pc_intr_disestablish = api_up1000_intr_disestablish;
 
@@ -166,18 +162,6 @@ api_up1000_intr_line(void *icv, pci_intr_handle_t ih)
 	return sio_intr_line(NULL /*XXX*/, ih);
 }
 
-#if 0
-const struct evcnt *
-api_up1000_intr_evcnt(void *icv, pci_intr_handle_t ih)
-{
-#if 0
-	struct irongate_config *icp = icv;
-#endif
-
-	return sio_intr_evcnt(NULL /*XXX*/, ih);
-}
-#endif
-
 void *
 api_up1000_intr_establish(void *icv, pci_intr_handle_t ih, int level,
     int (*func)(void *), void *arg, char *name)
diff --git a/sys/arch/alpha/pci/sio.c b/sys/arch/alpha/pci/sio.c
index 6dc2a6f24d8..e8580c600de 100644
--- a/sys/arch/alpha/pci/sio.c
+++ b/sys/arch/alpha/pci/sio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sio.c,v 1.28 2004/01/12 19:01:54 deraadt Exp $	*/
+/*	$OpenBSD: sio.c,v 1.29 2004/06/28 02:28:43 aaron Exp $	*/
 /*	$NetBSD: sio.c,v 1.15 1996/12/05 01:39:36 cgd Exp $	*/
 
 /*
@@ -168,9 +168,7 @@ sioattach(parent, self, aux)
 	sc->sc_haseisa = (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_INTEL &&
 		PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_PCEB);
 
-#ifdef EVCNT_COUNTERS
-	evcnt_attach(&sc->sc_dv, "intr", &sio_intr_evcnt);
-#endif
+	evcount_attach(&sio_intr_count, self->dv_xname, NULL, &evcount_intr);
 
 	set_pci_isa_bridge_callback(sio_bridge_callback, sc);
 }
diff --git a/sys/arch/alpha/pci/sio_pic.c b/sys/arch/alpha/pci/sio_pic.c
index 4b35058438e..84a462cbe0d 100644
--- a/sys/arch/alpha/pci/sio_pic.c
+++ b/sys/arch/alpha/pci/sio_pic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sio_pic.c,v 1.23 2004/06/18 21:33:42 miod Exp $	*/
+/*	$OpenBSD: sio_pic.c,v 1.24 2004/06/28 02:28:43 aaron Exp $	*/
 /* $NetBSD: sio_pic.c,v 1.28 2000/06/06 03:10:13 thorpej Exp $ */
 
 /*-
@@ -370,13 +370,6 @@ sio_intr_setup(pc, iot)
 	for (i = 0; i < ICU_LEN; i++) {
 		alpha_shared_intr_set_maxstrays(sio_intr, i, STRAY_MAX);
 
-#ifdef notyet
-		cp = alpha_shared_intr_string(sio_intr, i);
-		sprintf(cp, "irq %d", i);
-		evcnt_attach_dynamic(alpha_shared_intr_evcnt(sio_intr, i),
-		    EVCNT_TYPE_INTR, NULL, "isa", cp);
-#endif
-
 		switch (i) {
 		case 0:
 		case 1:
@@ -453,20 +446,6 @@ sio_intr_line(v, irq)
 	return (irq);
 }
 
-#ifdef notyet
-const struct evcnt *
-sio_intr_evcnt(v, irq)
-	void *v;
-	int irq;
-{
-
-	if (irq == 0 || irq >= ICU_LEN || irq == 2)
-		panic("sio_intr_evcnt: bogus isa irq 0x%x", irq);
-
-	return (alpha_shared_intr_evcnt(sio_intr, irq));
-}
-#endif
-
 void *
 sio_intr_establish(v, irq, type, level, fn, arg, name)
 	void *v, *arg;
diff --git a/sys/arch/alpha/pci/siovar.h b/sys/arch/alpha/pci/siovar.h
index e8798963ec3..a6d2ffaeae1 100644
--- a/sys/arch/alpha/pci/siovar.h
+++ b/sys/arch/alpha/pci/siovar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siovar.h,v 1.11 2002/03/14 03:15:50 millert Exp $	*/
+/*	$OpenBSD: siovar.h,v 1.12 2004/06/28 02:28:43 aaron Exp $	*/
 /*	$NetBSD: siovar.h,v 1.5 1996/10/23 04:12:34 cgd Exp $	*/
 
 /*
@@ -28,6 +28,8 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/evcount.h>
+
 void	sio_intr_setup(pci_chipset_tag_t, bus_space_tag_t);
 void	sio_iointr(void *framep, unsigned long vec);
 
@@ -37,6 +39,4 @@ void	*sio_intr_establish(void *, int, int, int, int (*)(void *),
 	    void *, char *);
 void	sio_intr_disestablish(void *, void *);
 
-#ifdef EVCNT_COUNTERS
-extern struct evcnt sio_intr_evcnt;
-#endif
+struct evcount sio_intr_count;