diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2010-09-20 06:33:49 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2010-09-20 06:33:49 +0000 |
| commit | 3e3ff0cf0db089f1bc7cf6089dc74b51d0a3af70 (patch) | |
| tree | fdd209a91e26cb3cbc1a90545f99b5db0880c7ce /sys/arch/macppc | |
| parent | ee9bd637e0295eeb7dfd37b2f3810841cbd814f7 (diff) | |
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@
Diffstat (limited to 'sys/arch/macppc')
| -rw-r--r-- | sys/arch/macppc/dev/macintr.c | 5 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/openpic.c | 17 | ||||
| -rw-r--r-- | sys/arch/macppc/macppc/clock.c | 6 |
3 files changed, 11 insertions, 17 deletions
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c index c73e45c0d9b..28dfdd6f5c1 100644 --- a/sys/arch/macppc/dev/macintr.c +++ b/sys/arch/macppc/dev/macintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macintr.c,v 1.39 2009/10/01 20:19:18 kettenis Exp $ */ +/* $OpenBSD: macintr.c,v 1.40 2010/09/20 06:33:47 matthew Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -288,8 +288,7 @@ printf("vI %d ", irq); ih->ih_next = NULL; ih->ih_level = level; ih->ih_irq = irq; - evcount_attach(&ih->ih_count, name, (void *)&m_hwirq[irq], - &evcount_intr); + evcount_attach(&ih->ih_count, name, &m_hwirq[irq]); *p = ih; return (ih); diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c index baae59719db..175db440e22 100644 --- a/sys/arch/macppc/dev/openpic.c +++ b/sys/arch/macppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.61 2010/08/07 03:50:01 krw Exp $ */ +/* $OpenBSD: openpic.c,v 1.62 2010/09/20 06:33:47 matthew Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -290,8 +290,7 @@ printf("vI %d ", irq); ih->ih_next = NULL; ih->ih_level = level; ih->ih_irq = irq; - evcount_attach(&ih->ih_count, name, (void *)&o_hwirq[irq], - &evcount_intr); + evcount_attach(&ih->ih_count, name, &o_hwirq[irq]); *p = ih; return (ih); @@ -789,14 +788,10 @@ openpic_init() x |= (15 << OPENPIC_PRIORITY_SHIFT) | IPI_VECTOR_DDB; openpic_write(OPENPIC_IPI_VECTOR(1), x); - evcount_attach(&ipi_nop[0], "ipi_nop0", (void *)&ipi_nopirq, - &evcount_intr); - evcount_attach(&ipi_nop[1], "ipi_nop1", (void *)&ipi_nopirq, - &evcount_intr); - evcount_attach(&ipi_ddb[0], "ipi_ddb0", (void *)&ipi_ddbirq, - &evcount_intr); - evcount_attach(&ipi_ddb[1], "ipi_ddb1", (void *)&ipi_ddbirq, - &evcount_intr); + evcount_attach(&ipi_nop[0], "ipi_nop0", &ipi_nopirq); + evcount_attach(&ipi_nop[1], "ipi_nop1", &ipi_nopirq); + evcount_attach(&ipi_ddb[0], "ipi_ddb0", &ipi_ddbirq); + evcount_attach(&ipi_ddb[1], "ipi_ddb1", &ipi_ddbirq); #endif /* XXX set spurious intr vector */ diff --git a/sys/arch/macppc/macppc/clock.c b/sys/arch/macppc/macppc/clock.c index bab7bca11f6..c3d88efbe81 100644 --- a/sys/arch/macppc/macppc/clock.c +++ b/sys/arch/macppc/macppc/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.30 2009/10/01 20:19:18 kettenis Exp $ */ +/* $OpenBSD: clock.c,v 1.31 2010/09/20 06:33:47 matthew Exp $ */ /* $NetBSD: clock.c,v 1.1 1996/09/30 16:34:40 ws Exp $ */ /* @@ -316,8 +316,8 @@ cpu_initclocks() statvar >>= 1; statmin = statint - (statvar >> 1); - evcount_attach(&clk_count, "clock", (void *)&clk_irq, &evcount_intr); - evcount_attach(&stat_count, "stat", (void *)&stat_irq, &evcount_intr); + evcount_attach(&clk_count, "clock", &clk_irq); + evcount_attach(&stat_count, "stat", &stat_irq); cpu_startclock(); |