diff options
| author | Marco Peereboom <marco@cvs.openbsd.org> | 2004-05-23 05:29:32 +0000 |
|---|---|---|
| committer | Marco Peereboom <marco@cvs.openbsd.org> | 2004-05-23 05:29:32 +0000 |
| commit | c93feeec30357ff7ad2044c2bc51bb09863c48f4 (patch) | |
| tree | 0099f5e3cc035a026bc306ad92f35299c34d0b04 /sys/dev/ic/aic79xx_openbsd.h | |
| parent | 34447e416786756bc119bb656f0af2322288037c (diff) | |
Hack to prevent uvm_fault when timeout_del deletes a non-existing timer during boot. ok krw@
Diffstat (limited to 'sys/dev/ic/aic79xx_openbsd.h')
| -rw-r--r-- | sys/dev/ic/aic79xx_openbsd.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/ic/aic79xx_openbsd.h b/sys/dev/ic/aic79xx_openbsd.h index 9e9fefd8cfc..e70a2711a3b 100644 --- a/sys/dev/ic/aic79xx_openbsd.h +++ b/sys/dev/ic/aic79xx_openbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx_openbsd.h,v 1.2 2004/05/20 04:35:47 marco Exp $ */ +/* $OpenBSD: aic79xx_openbsd.h,v 1.3 2004/05/23 05:29:31 marco Exp $ */ /* * FreeBSD platform specific driver option settings, data structures, * function declarations and includes. @@ -87,7 +87,8 @@ #define offsetof(type, member) ((size_t)(&((type *)0)->member)) #endif -/************************* Forward Declarations *******************************/typedef struct pci_attach_args * ahd_dev_softc_t; +/************************* Forward Declarations *******************************/ +typedef struct pci_attach_args * ahd_dev_softc_t; /***************************** Bus Space/DMA **********************************/ @@ -420,7 +421,10 @@ ahd_platform_scb_free(struct ahd_softc *ahd, struct scb *scb) ahd->flags &= ~AHD_RESOURCE_SHORTAGE; } - timeout_del(&scb->xs->stimeout); + if (!cold) { + /* we are no longer in autoconf */ + timeout_del(&scb->xs->stimeout); + } ahd_unlock(ahd, &s); } |