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/socppc | |
| 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/socppc')
| -rw-r--r-- | sys/arch/socppc/dev/ipic.c | 4 | ||||
| -rw-r--r-- | sys/arch/socppc/socppc/clock.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/socppc/dev/ipic.c b/sys/arch/socppc/dev/ipic.c index 0327894dcd9..389fc44f007 100644 --- a/sys/arch/socppc/dev/ipic.c +++ b/sys/arch/socppc/dev/ipic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipic.c,v 1.12 2010/03/03 21:52:13 kettenis Exp $ */ +/* $OpenBSD: ipic.c,v 1.13 2010/09/20 06:33:48 matthew Exp $ */ /* * Copyright (c) 2008 Mark Kettenis @@ -292,7 +292,7 @@ intr_establish(int ivec, int type, int level, ih->ih_next = NULL; ih->ih_level = level; ih->ih_irq = ivec; - evcount_attach(&ih->ih_count, name, NULL, &evcount_intr); + evcount_attach(&ih->ih_count, name, NULL); *p = ih; if (sc) { diff --git a/sys/arch/socppc/socppc/clock.c b/sys/arch/socppc/socppc/clock.c index 4a3d87d3fb5..d063e72bfd1 100644 --- a/sys/arch/socppc/socppc/clock.c +++ b/sys/arch/socppc/socppc/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.7 2009/10/01 20:19:19 kettenis Exp $ */ +/* $OpenBSD: clock.c,v 1.8 2010/09/20 06:33:48 matthew Exp $ */ /* $NetBSD: clock.c,v 1.1 1996/09/30 16:34:40 ws Exp $ */ /* @@ -262,8 +262,8 @@ cpu_initclocks(void) 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); ticks_per_intr = ticks_per_sec / hz; cpu_startclock(); |