diff options
| author | Christiano F. Haesbaert <haesbaert@cvs.openbsd.org> | 2012-09-12 06:53:06 +0000 |
|---|---|---|
| committer | Christiano F. Haesbaert <haesbaert@cvs.openbsd.org> | 2012-09-12 06:53:06 +0000 |
| commit | aeb87b8714220d70b92104d1d7fab5327324f1f9 (patch) | |
| tree | 4e5a334b6fce8a4ab2f0a1d231c873d3c431373f /sys/dev/ic | |
| parent | 2d3b63e4a5a580d52123bfd5dcc09fe374ce3272 (diff) | |
Make sure we don't sleep on autoconf.
ok mikeb
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/mfi.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/mpi.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index 4481f7c8884..71975b689cc 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi.c,v 1.137 2012/08/17 11:31:34 dlg Exp $ */ +/* $OpenBSD: mfi.c,v 1.138 2012/09/12 06:53:05 haesbaert Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -2045,7 +2045,7 @@ mfi_create_sensors(struct mfi_softc *sc) return (1); sc->sc_sensors = malloc(sizeof(struct ksensor) * sc->sc_ld_cnt, - M_DEVBUF, M_WAITOK | M_CANFAIL | M_ZERO); + M_DEVBUF, M_NOWAIT | M_ZERO); if (sc->sc_sensors == NULL) return (1); diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c index bed852d9400..7591d32b03f 100644 --- a/sys/dev/ic/mpi.c +++ b/sys/dev/ic/mpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpi.c,v 1.176 2012/08/26 11:33:44 dlg Exp $ */ +/* $OpenBSD: mpi.c,v 1.177 2012/09/12 06:53:05 haesbaert Exp $ */ /* * Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org> @@ -3398,7 +3398,7 @@ mpi_create_sensors(struct mpi_softc *sc) return (0); sc->sc_sensors = malloc(sizeof(struct ksensor) * vol, - M_DEVBUF, M_WAITOK|M_CANFAIL|M_ZERO); + M_DEVBUF, M_NOWAIT | M_ZERO); if (sc->sc_sensors == NULL) return (1); |