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/mips64 | |
| 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/mips64')
| -rw-r--r-- | sys/arch/mips64/mips64/clock.c | 4 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/interrupt.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/mips64/mips64/clock.c b/sys/arch/mips64/mips64/clock.c index 0107a74ca6b..4237351a1d7 100644 --- a/sys/arch/mips64/mips64/clock.c +++ b/sys/arch/mips64/mips64/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.33 2010/02/28 17:23:25 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.34 2010/09/20 06:33:47 matthew Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -94,7 +94,7 @@ clockattach(struct device *parent, struct device *self, void *aux) * be computed correctly. */ set_intr(INTPRI_CLOCK, CR_INT_5, clock_int5); - evcount_attach(&clk_count, "clock", (void *)&clk_irq, &evcount_intr); + evcount_attach(&clk_count, "clock", &clk_irq); /* try to avoid getting clock interrupts early */ cp0_set_compare(cp0_get_count() - 1); } diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c index 4ee5e9b8c8f..fc7e579d8ae 100644 --- a/sys/arch/mips64/mips64/interrupt.c +++ b/sys/arch/mips64/mips64/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.59 2010/04/21 03:03:26 deraadt Exp $ */ +/* $OpenBSD: interrupt.c,v 1.60 2010/09/20 06:33:47 matthew Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -164,8 +164,7 @@ set_intr(int pri, uint32_t mask, uint32_t (*int_hand)(uint32_t, struct trap_frame *)) { if ((idle_mask & SOFT_INT_MASK) == 0) - evcount_attach(&soft_count, "soft", (void *)&soft_irq, - &evcount_intr); + evcount_attach(&soft_count, "soft", &soft_irq); if (pri < 0 || pri >= NLOWINT) panic("set_intr: too high priority (%d), increase NLOWINT", pri); |