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/sgi/xbow | |
| 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/sgi/xbow')
| -rw-r--r-- | sys/arch/sgi/xbow/xbridge.c | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/xbow/xheart.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/sgi/xbow/xbridge.c b/sys/arch/sgi/xbow/xbridge.c index 188fcc047e8..83292a7420a 100644 --- a/sys/arch/sgi/xbow/xbridge.c +++ b/sys/arch/sgi/xbow/xbridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xbridge.c,v 1.74 2010/08/23 16:56:18 miod Exp $ */ +/* $OpenBSD: xbridge.c,v 1.75 2010/09/20 06:33:47 matthew Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. @@ -1071,7 +1071,7 @@ xbridge_intr_establish(void *cookie, pci_intr_handle_t ih, int level, xih->xih_arg = arg; xih->xih_level = level; xih->xih_device = device; - evcount_attach(&xih->xih_count, name, &xi->xi_intrsrc, &evcount_intr); + evcount_attach(&xih->xih_count, name, &xi->xi_intrsrc); LIST_INSERT_HEAD(&xi->xi_handlers, xih, xih_nxt); if (new) { diff --git a/sys/arch/sgi/xbow/xheart.c b/sys/arch/sgi/xbow/xheart.c index 88b0f640cb7..1021cd7937f 100644 --- a/sys/arch/sgi/xbow/xheart.c +++ b/sys/arch/sgi/xbow/xheart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xheart.c,v 1.19 2009/11/26 23:32:46 syuu Exp $ */ +/* $OpenBSD: xheart.c,v 1.20 2010/09/20 06:33:47 matthew Exp $ */ /* * Copyright (c) 2008 Miodrag Vallat. @@ -326,8 +326,7 @@ xheart_intr_establish(int (*func)(void *), void *arg, int intrbit, ih->ih_level = level; ih->ih_irq = intrbit; if (name != NULL) - evcount_attach(&ih->ih_count, name, &ih->ih_level, - &evcount_intr); + evcount_attach(&ih->ih_count, name, &ih->ih_level); s = splhigh(); |