diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-07-20 21:55:51 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-07-20 21:55:51 +0000 |
| commit | 9b5537f456108c0392f867001892a52da1723465 (patch) | |
| tree | f399e5552dd56c62029f7df78e68ae2eeee8c3e1 /sys/arch/mips64 | |
| parent | 826317abf94be3900ba9723b2e7d0d11ba1c012e (diff) | |
Always do the netisr_dispatch dance, rather than trying to be smart and use a
three-line #if construct around it, which is wrong since the addition of
kernel pppoe and bluetooth code.
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/mips64/interrupt.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c index e6d57c52063..e8d3024db5a 100644 --- a/sys/arch/mips64/mips64/interrupt.c +++ b/sys/arch/mips64/mips64/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.16 2005/07/18 02:43:25 fgsch Exp $ */ +/* $OpenBSD: interrupt.c,v 1.17 2005/07/20 21:55:50 miod Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -204,9 +204,6 @@ printf("Unhandled interrupt %x:%x\n", cause, pending); clr_ipending(SINT_CLOCKMASK); softclock(); } -#if defined(INET) || defined(INET6) || defined(NETATALK) || defined(IMP) || \ - defined(IPX) || defined(NS) || NATM > 0 || \ - NPPP > 0 || NBRIDGE > 0 if ((ipending & SINT_NETMASK) & ~xcpl) { extern int netisr; int isr = netisr; @@ -215,7 +212,6 @@ printf("Unhandled interrupt %x:%x\n", cause, pending); #define DONETISR(b,f) if (isr & (1 << (b))) f(); #include <net/netisr_dispatch.h> } -#endif #ifdef NOTYET if ((ipending & SINT_TTYMASK) & ~xcpl) { @@ -332,7 +328,6 @@ generic_intr_establish(icp, irq, type, level, ih_fun, ih_arg, ih_what) struct intrhand **p, *q, *ih; static struct intrhand fakehand = {NULL, fakeintr}; int edge; -extern int cold; static int initialized = 0; @@ -513,9 +508,6 @@ generic_do_pending_int(int newcpl) clr_ipending(SINT_CLOCKMASK); softclock(); } -#if defined(INET) || defined(INET6) || defined(NETATALK) || defined(IMP) || \ - defined(IPX) || defined(NS) || NATM > 0 || \ - NPPP > 0 || NBRIDGE > 0 if ((ipending & SINT_NETMASK) & ~newcpl) { int isr = netisr; netisr = 0; @@ -523,7 +515,6 @@ generic_do_pending_int(int newcpl) #define DONETISR(b,f) if (isr & (1 << (b))) f(); #include <net/netisr_dispatch.h> } -#endif #ifdef NOTYET if ((ipending & SINT_TTYMASK) & ~newcpl) { |