diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-12-01 21:19:13 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-12-01 21:19:13 +0000 |
| commit | 0acb01bdfdb26b0085a453ba0a2d3db3a9cbbcfa (patch) | |
| tree | 27b619cdc548bc57a74ef43ce2aed5a91f8a2b2d | |
| parent | cb640cff45bc63fe693dff8341703f90499026d7 (diff) | |
Let kernels with option DEBUG link again.
| -rw-r--r-- | sys/arch/mac68k/dev/if_ae_nubus.c | 6 | ||||
| -rw-r--r-- | sys/arch/mac68k/include/viareg.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/arch/mac68k/dev/if_ae_nubus.c b/sys/arch/mac68k/dev/if_ae_nubus.c index c536a454295..9ede3d5cf43 100644 --- a/sys/arch/mac68k/dev/if_ae_nubus.c +++ b/sys/arch/mac68k/dev/if_ae_nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ae_nubus.c,v 1.10 2004/11/26 21:21:24 miod Exp $ */ +/* $OpenBSD: if_ae_nubus.c,v 1.11 2004/12/01 21:19:11 miod Exp $ */ /* $NetBSD: if_ae_nubus.c,v 1.17 1997/05/01 18:17:16 briggs Exp $ */ /* @@ -426,13 +426,15 @@ ae_nb_watchdog(ifp) struct ifnet *ifp; { struct ae_softc *sc = ifp->if_softc; + extern struct intrhand via2intrs[7]; /* * This is a kludge! The via code seems to miss slot interrupts * sometimes. This kludges around that by calling the handler * by hand if the watchdog is activated. -- XXX (akb) */ - (*via2itab[1])((void *) 1); + if (via2intrs[1].ih_fn != NULL) + (void)(*via2intrs[1].ih_fn)(via2intrs[1].ih_arg); log(LOG_ERR, "%s: device timeout\n", sc->sc_dev.dv_xname); ++sc->sc_arpcom.ac_if.if_oerrors; diff --git a/sys/arch/mac68k/include/viareg.h b/sys/arch/mac68k/include/viareg.h index d82bd1fbb4e..355b12ed100 100644 --- a/sys/arch/mac68k/include/viareg.h +++ b/sys/arch/mac68k/include/viareg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: viareg.h,v 1.11 2004/11/26 21:21:27 miod Exp $ */ +/* $OpenBSD: viareg.h,v 1.12 2004/12/01 21:19:12 miod Exp $ */ /* $NetBSD: viareg.h,v 1.6 1997/02/28 07:41:41 scottr Exp $ */ /*- @@ -198,9 +198,6 @@ void add_nubus_intr(int, int (*)(void *), void *, const char *); void enable_nubus_intr(void); void via1_register_irq(int, int (*)(void *), void *, const char *); void via2_register_irq(int, int (*)(void *), void *, const char *); - -extern void (*via1itab[7])(void *); -extern void (*via2itab[7])(void *); #endif /* _KERNEL */ #endif /* _MAC68K_VIAREG_H_ */ |