diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2013-05-22 16:02:32 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2013-05-22 16:02:32 +0000 |
| commit | 265121a863420852aecc24ece7bffc34dc7abe63 (patch) | |
| tree | 7b0be38965606b92e1e59b04df412d3375ab5723 /sys/dev/pci | |
| parent | 04b38e57ea534b5bee8c93a3705a75b8ee459761 (diff) | |
BUS_DMA_WAITOK can't be used in the bge_init path since it
might be called from a timeout(9); ok kettenis, dlg, deraadt
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_bge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 055ceec2d1f..1d37192a9f9 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.327 2013/04/07 03:22:05 dlg Exp $ */ +/* $OpenBSD: if_bge.c,v 1.328 2013/05/22 16:02:31 mikeb Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -1226,7 +1226,7 @@ bge_init_rx_ring_std(struct bge_softc *sc) for (i = 0; i < BGE_STD_RX_RING_CNT; i++) { if (bus_dmamap_create(sc->bge_dmatag, MCLBYTES, 1, MCLBYTES, 0, - BUS_DMA_WAITOK | BUS_DMA_ALLOCNOW, + BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &sc->bge_cdata.bge_rx_std_map[i]) != 0) { printf("%s: unable to create dmamap for slot %d\n", sc->bge_dev.dv_xname, i); @@ -1336,7 +1336,7 @@ bge_init_rx_ring_jumbo(struct bge_softc *sc) for (i = 0; i < BGE_JUMBO_RX_RING_CNT; i++) { if (bus_dmamap_create(sc->bge_dmatag, BGE_JLEN, 4, BGE_JLEN, 0, - BUS_DMA_WAITOK | BUS_DMA_ALLOCNOW, + BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &sc->bge_cdata.bge_rx_jumbo_map[i]) != 0) { printf("%s: unable to create dmamap for slot %d\n", sc->bge_dev.dv_xname, i); |