diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-10-01 20:28:43 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-10-01 20:28:43 +0000 |
| commit | 73759e9306eb013cd0ab391eb2c50a57b4658e90 (patch) | |
| tree | e43c551e0cbdc7bf48eece9ecad22f51be2e7d28 | |
| parent | e86cf37c5e37b5bca4e72f809b1481e7360800f5 (diff) | |
Sync with openpic.c evcount fixes; ok drahn@
| -rw-r--r-- | sys/arch/macppc/dev/macintr.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c index 963f50efc32..741e8d282e7 100644 --- a/sys/arch/macppc/dev/macintr.c +++ b/sys/arch/macppc/dev/macintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macintr.c,v 1.24 2004/06/28 02:49:43 deraadt Exp $ */ +/* $OpenBSD: macintr.c,v 1.25 2004/10/01 20:28:42 miod Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -63,8 +63,6 @@ int m_hwirq[ICU_LEN], m_virq[64]; unsigned int imen_m = 0xffffffff; int m_virq_max = 0; -struct evcnt m_evirq[ICU_LEN*2]; - static int fakeintr(void *); static char *intr_typename(int type); static void intr_calculatemasks(void); @@ -529,7 +527,6 @@ start: } uvmexp.intrs++; - m_evirq[m_hwirq[irq]].ev_count++; } int_state &= ~r_imen; if (int_state) @@ -565,11 +562,10 @@ mac_intr_do_pending_int() hwpend &= ~(1L << irq); ih = m_intrhand[irq]; while(ih) { - (*ih->ih_fun)(ih->ih_arg); + if ((*ih->ih_fun)(ih->ih_arg)) + ih->ih_count.ec_count++; ih = ih->ih_next; } - - m_evirq[m_hwirq[irq]].ev_count++; } /*out32rb(INT_ENABLE_REG, ~imen_m);*/ |