Get rid of evcount's support for arranging counters in a tree

hierarchy.  Everything attached to a single root node anyway, so at
best we had a bush.

"i think it is good" deraadt@

3 files changed, 7 insertions, 9 deletions

diff --git a/sys/arch/i386/i386/ioapic.c b/sys/arch/i386/i386/ioapic.c
index 5574d4e5abf..5e61bab1aa5 100644
--- a/sys/arch/i386/i386/ioapic.c
+++ b/sys/arch/i386/i386/ioapic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioapic.c,v 1.24 2010/08/08 16:43:19 deraadt Exp $	*/
+/*	$OpenBSD: ioapic.c,v 1.25 2010/09/20 06:33:47 matthew Exp $	*/
 /* 	$NetBSD: ioapic.c,v 1.7 2003/07/14 22:32:40 lukem Exp $	*/
 
 /*-
@@ -730,8 +730,7 @@ apic_intr_establish(int irq, int type, int level, int (*ih_fun)(void *),
 	ih->ih_next = NULL;
 	ih->ih_level = level;
 	ih->ih_irq = irq;
-	evcount_attach(&ih->ih_count, ih_what, (void *)&pin->ip_vector,
-	    &evcount_intr);
+	evcount_attach(&ih->ih_count, ih_what, &pin->ip_vector);
 
 	*p = ih;
 
diff --git a/sys/arch/i386/i386/lapic.c b/sys/arch/i386/i386/lapic.c
index b0c6e5f01c1..495cff631ca 100644
--- a/sys/arch/i386/i386/lapic.c
+++ b/sys/arch/i386/i386/lapic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lapic.c,v 1.30 2010/07/25 21:43:35 deraadt Exp $	*/
+/*	$OpenBSD: lapic.c,v 1.31 2010/09/20 06:33:47 matthew Exp $	*/
 /* $NetBSD: lapic.c,v 1.1.2.8 2000/02/23 06:10:50 sommerfeld Exp $ */
 
 /*-
@@ -211,9 +211,9 @@ lapic_boot_init(paddr_t lapic_base)
 	idt_vec_set(LAPIC_SPURIOUS_VECTOR, Xintrspurious);
 	idt_vec_set(LAPIC_TIMER_VECTOR, Xintrltimer);
 
-	evcount_attach(&clk_count, "clock", (void *)&clk_irq, &evcount_intr);
+	evcount_attach(&clk_count, "clock", &clk_irq);
 #ifdef MULTIPROCESSOR
-	evcount_attach(&ipi_count, "ipi", (void *)&ipi_irq, &evcount_intr);
+	evcount_attach(&ipi_count, "ipi", &ipi_irq);
 #endif
 }
 
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index 3b77563db12..75f9981ddc1 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.c,v 1.69 2010/03/25 22:44:57 oga Exp $	*/
+/*	$OpenBSD: isa_machdep.c,v 1.70 2010/09/20 06:33:47 matthew Exp $	*/
 /*	$NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $	*/
 
 /*-
@@ -554,8 +554,7 @@ isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level,
 	ih->ih_next = NULL;
 	ih->ih_level = level;
 	ih->ih_irq = irq;
-	evcount_attach(&ih->ih_count, ih_what, (void *)&ih->ih_irq,
-	    &evcount_intr);
+	evcount_attach(&ih->ih_count, ih_what, &ih->ih_irq);
 	*p = ih;
 
 	return (ih);