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

3 files changed, 6 insertions, 14 deletions

diff --git a/sys/arch/vax/bi/bivar.h b/sys/arch/vax/bi/bivar.h
index ebd21677460..06ce7375958 100644
--- a/sys/arch/vax/bi/bivar.h
+++ b/sys/arch/vax/bi/bivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bivar.h,v 1.6 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: bivar.h,v 1.7 2007/05/10 17:59:26 deraadt Exp $ */
 /*	$NetBSD: bivar.h,v 1.8 2000/07/26 12:41:40 ragge Exp $ */
 /*
  * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
@@ -78,4 +78,4 @@ struct bi_list {
 
 /* Prototype */
 void bi_attach (struct bi_softc *);
-void bi_intr_establish (void *, int, void (*)(void *), void *, struct evcnt *);
+void bi_intr_establish (void *, int, void (*)(void *), void *);
diff --git a/sys/arch/vax/bi/if_ni.c b/sys/arch/vax/bi/if_ni.c
index 5dc1aecfec8..29760c45872 100644
--- a/sys/arch/vax/bi/if_ni.c
+++ b/sys/arch/vax/bi/if_ni.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ni.c,v 1.8 2006/03/25 22:41:41 djm Exp $ */
+/*	$OpenBSD: if_ni.c,v 1.9 2007/05/10 17:59:26 deraadt Exp $ */
 /*	$NetBSD: if_ni.c,v 1.15 2002/05/22 16:03:14 wiz Exp $ */
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -119,7 +119,6 @@
 
 struct	ni_softc {
 	struct device	sc_dev;		/* Configuration common part	*/
-	struct evcnt	sc_intrcnt;	/* Interrupt counting		*/
 	struct ethercom sc_ec;		/* Ethernet common part		*/
 #define sc_if	sc_ec.ec_if		/* network-visible interface	*/
 	bus_space_tag_t sc_iot;
@@ -246,10 +245,7 @@ niattach(parent, self, aux)
 	sc->sc_ioh = ba->ba_ioh;
 	sc->sc_dmat = ba->ba_dmat;
 
-	bi_intr_establish(ba->ba_icookie, ba->ba_ivec,
-		niintr, sc, &sc->sc_intrcnt);
-	evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL,
-		sc->sc_dev.dv_xname, "intr");
+	bi_intr_establish(ba->ba_icookie, ba->ba_ivec, niintr, sc);
 
 	ni_getpgs(sc, sizeof(struct ni_gvppqb), (caddr_t *)&sc->sc_gvppqb, 
 	    (paddr_t *)&sc->sc_pgvppqb);
diff --git a/sys/arch/vax/bi/kdb.c b/sys/arch/vax/bi/kdb.c
index 2998bcac84a..6fb2415a3c5 100644
--- a/sys/arch/vax/bi/kdb.c
+++ b/sys/arch/vax/bi/kdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kdb.c,v 1.9 2006/01/17 20:26:14 miod Exp $ */
+/*	$OpenBSD: kdb.c,v 1.10 2007/05/10 17:59:26 deraadt Exp $ */
 /*	$NetBSD: kdb.c,v 1.26 2001/11/13 12:51:34 lukem Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -76,7 +76,6 @@
  */
 struct	kdb_softc {
 	struct	device sc_dev;		/* Autoconfig info */
-	struct	evcnt sc_intrcnt;	/* Interrupt counting */
 	caddr_t	sc_kdb;			/* Struct for kdb communication */
 	struct	mscp_softc *sc_softc;	/* MSCP info (per mscpvar.h) */
 	bus_dma_tag_t sc_dmat;
@@ -151,10 +150,7 @@ kdbattach(parent, self, aux)
 	bus_dma_segment_t seg;
 
 	printf("\n");
-	bi_intr_establish(ba->ba_icookie, ba->ba_ivec,
-		kdbintr, sc, &sc->sc_intrcnt);
-	evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL,
-		sc->sc_dev.dv_xname, "intr");
+	bi_intr_establish(ba->ba_icookie, ba->ba_ivec, kdbintr, sc);
 
 	sc->sc_iot = ba->ba_iot;
 	sc->sc_ioh = ba->ba_ioh;