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/hppa | |
| 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/hppa')
| -rw-r--r-- | sys/arch/hppa/dev/apic.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/intr.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/hppa/dev/apic.c b/sys/arch/hppa/dev/apic.c index e419cf0df0a..59e3c4710ac 100644 --- a/sys/arch/hppa/dev/apic.c +++ b/sys/arch/hppa/dev/apic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apic.c,v 1.11 2010/08/07 03:50:01 krw Exp $ */ +/* $OpenBSD: apic.c,v 1.12 2010/09/20 06:33:47 matthew Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -188,7 +188,7 @@ apic_intr_establish(void *v, pci_intr_handle_t ih, return (NULL); } - evcount_attach(cnt, name, NULL, &evcount_intr); + evcount_attach(cnt, name, NULL); biv = apic_intr_list[irq]; while (biv->next) biv = biv->next; diff --git a/sys/arch/hppa/hppa/intr.c b/sys/arch/hppa/hppa/intr.c index 5f42f6f57a7..e6ff9249093 100644 --- a/sys/arch/hppa/hppa/intr.c +++ b/sys/arch/hppa/hppa/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.34 2010/07/01 21:14:01 jsing Exp $ */ +/* $OpenBSD: intr.c,v 1.35 2010/09/20 06:33:47 matthew Exp $ */ /* * Copyright (c) 2002-2004 Michael Shalayeff @@ -193,7 +193,7 @@ cpu_intr_map(void *v, int pri, int irq, int (*handler)(void *), void *arg, } } - evcount_attach(cnt, name, NULL, &evcount_intr); + evcount_attach(cnt, name, NULL); iv->pri = pri; iv->irq = irq; iv->flags = 0; @@ -247,7 +247,7 @@ cpu_intr_establish(int pri, int irq, int (*handler)(void *), void *arg, free(cnt, M_DEVBUF); iv->cnt = NULL; } else - evcount_attach(cnt, name, NULL, &evcount_intr); + evcount_attach(cnt, name, NULL); return (iv); } |