diff options
| -rw-r--r-- | sys/dev/softraid_crypto.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/udl.c | 4 | ||||
| -rw-r--r-- | sys/scsi/safte.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c index 28c4dbe418f..9ebb3c74f1b 100644 --- a/sys/dev/softraid_crypto.c +++ b/sys/dev/softraid_crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_crypto.c,v 1.56 2010/09/27 02:56:28 marco Exp $ */ +/* $OpenBSD: softraid_crypto.c,v 1.57 2010/09/27 19:49:43 thib Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org> @@ -867,7 +867,7 @@ sr_crypto_read_key_disk(struct sr_discipline *sd, dev_t dev) /* * Read and validate key disk metadata. */ - sm = malloc(SR_META_SIZE * 512, M_DEVBUF, M_ZERO); + sm = malloc(SR_META_SIZE * 512, M_DEVBUF, M_NOWAIT|M_ZERO); if (sm == NULL) { printf("%s: not enough memory for metadata buffer\n", DEVNAME(sc)); @@ -893,7 +893,7 @@ sr_crypto_read_key_disk(struct sr_discipline *sd, dev_t dev) } /* Construct key disk chunk. */ - key_disk = malloc(sizeof(struct sr_chunk), M_DEVBUF, M_ZERO); + key_disk = malloc(sizeof(struct sr_chunk), M_DEVBUF, M_NOWAIT|M_ZERO); if (key_disk == NULL) { printf("%s: not enough memory for chunk\n", DEVNAME(sc)); diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c index 72e8304e9a8..4f14971d98c 100644 --- a/sys/dev/usb/udl.c +++ b/sys/dev/usb/udl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udl.c,v 1.61 2010/08/31 17:00:05 deraadt Exp $ */ +/* $OpenBSD: udl.c,v 1.62 2010/09/27 19:49:43 thib Exp $ */ /* * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org> @@ -657,7 +657,7 @@ udl_alloc_screen(void *v, const struct wsscreen_descr *type, /* allocate character backing store */ sc->sc_cbs = malloc((sc->sc_ri.ri_rows * sc->sc_ri.ri_cols) * - sizeof(*sc->sc_cbs), M_DEVBUF, M_ZERO); + sizeof(*sc->sc_cbs), M_DEVBUF, M_NOWAIT|M_ZERO); if (sc->sc_cbs == NULL) { printf("%s: can't allocate mem for character backing store!\n", DN(sc)); diff --git a/sys/scsi/safte.c b/sys/scsi/safte.c index 58e903e9939..941d621f86e 100644 --- a/sys/scsi/safte.c +++ b/sys/scsi/safte.c @@ -1,4 +1,4 @@ -/* $OpenBSD: safte.c,v 1.45 2010/08/30 02:47:56 matthew Exp $ */ +/* $OpenBSD: safte.c,v 1.46 2010/09/27 19:49:43 thib Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -583,7 +583,7 @@ safte_bio_blink(struct safte_softc *sc, struct bioc_blink *blink) if (slot >= sc->sc_nslots) return (ENODEV); - op = malloc(sizeof(*op), M_TEMP, M_ZERO); + op = malloc(sizeof(*op), M_TEMP, M_WAITOK|M_ZERO); op->opcode = SAFTE_WRITE_SLOTOP; op->slot = slot; |