summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2018-01-15 21:09:58 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2018-01-15 21:09:58 +0000
commita67b3b1621b20979f6e204b8ee3eeaf98dd2de73 (patch)
tree6355ffb77c7585ceee36eddbbd463d451309eebc
parent74641f0bc6f251da3823151f435518b96df3bb9a (diff)
Notes
-rw-r--r--sys/arm/xscale/ixp425/if_npe.c3
-rw-r--r--sys/arm64/arm64/busdma_bounce.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arm/xscale/ixp425/if_npe.c b/sys/arm/xscale/ixp425/if_npe.c
index d797154ee1d4..c5c6033f01b7 100644
--- a/sys/arm/xscale/ixp425/if_npe.c
+++ b/sys/arm/xscale/ixp425/if_npe.c
@@ -515,7 +515,8 @@ npe_dma_setup(struct npe_softc *sc, struct npedma *dma,
return error;
}
/* XXX M_TEMP */
- dma->buf = malloc(nbuf * sizeof(struct npebuf), M_TEMP, M_NOWAIT | M_ZERO);
+ dma->buf = mallocarray(nbuf, sizeof(struct npebuf), M_TEMP,
+ M_NOWAIT | M_ZERO);
if (dma->buf == NULL) {
device_printf(sc->sc_dev,
"unable to allocate memory for %s s/w buffers\n",
diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c
index 31eaf05370b6..9b6d944bd33d 100644
--- a/sys/arm64/arm64/busdma_bounce.c
+++ b/sys/arm64/arm64/busdma_bounce.c
@@ -302,8 +302,8 @@ bounce_bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
error = 0;
if (dmat->segments == NULL) {
- dmat->segments = (bus_dma_segment_t *)malloc(
- sizeof(bus_dma_segment_t) * dmat->common.nsegments,
+ dmat->segments = (bus_dma_segment_t *)mallocarray(
+ dmat->common.nsegments, sizeof(bus_dma_segment_t),
M_DEVBUF, M_NOWAIT);
if (dmat->segments == NULL) {
CTR3(KTR_BUSDMA, "%s: tag %p error %d",