diff options
| author | Charles Longeau <chl@cvs.openbsd.org> | 2007-09-17 15:34:39 +0000 |
|---|---|---|
| committer | Charles Longeau <chl@cvs.openbsd.org> | 2007-09-17 15:34:39 +0000 |
| commit | 32edbddb7c4f4dab431a8576907f802b3848c355 (patch) | |
| tree | 2866a513878e0564f5ef12e2b343073d173f4020 /sys/arch/amd64/isa | |
| parent | 1d9168709cd84e6ee98534bb1b51d58498dd71ca (diff) | |
MALLOC/FREE -> malloc/free and M_ZERO changes
ok krw@
Diffstat (limited to 'sys/arch/amd64/isa')
| -rw-r--r-- | sys/arch/amd64/isa/isa_machdep.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/isa/isa_machdep.c b/sys/arch/amd64/isa/isa_machdep.c index 29a42bc0cac..e28f9e81fe0 100644 --- a/sys/arch/amd64/isa/isa_machdep.c +++ b/sys/arch/amd64/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.12 2007/04/28 03:55:40 jsg Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.13 2007/09/17 15:34:38 chl Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -444,11 +444,11 @@ _isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments, * Allocate our cookie. */ if ((cookiestore = malloc(cookiesize, M_DEVBUF, - (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL) { + (flags & BUS_DMA_NOWAIT) ? + (M_NOWAIT|M_ZERO) : (M_WAITOK|M_ZERO))) == NULL) { error = ENOMEM; goto out; } - bzero(cookiestore, cookiesize); cookie = (struct x86_isa_dma_cookie *)cookiestore; cookie->id_flags = cookieflags; map->_dm_cookie = cookie; |