Date: Tue, 16 Jan 2018 06:04:40 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328041 - head/sys/mips/mips Message-ID: <201801160604.w0G64eKa091552@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Tue Jan 16 06:04:39 2018 New Revision: 328041 URL: https://svnweb.freebsd.org/changeset/base/328041 Log: Fix build after r328020. Should have noticed earlier but the build was already broken by another change. Reported by: Ravi Pokala Modified: head/sys/mips/mips/busdma_machdep.c Modified: head/sys/mips/mips/busdma_machdep.c ============================================================================== --- head/sys/mips/mips/busdma_machdep.c Tue Jan 16 04:50:23 2018 (r328040) +++ head/sys/mips/mips/busdma_machdep.c Tue Jan 16 06:04:39 2018 (r328041) @@ -535,7 +535,8 @@ bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_d int error = 0; if (dmat->segments == NULL) { - dmat->segments = (bus_dma_segment_t *)malloc(dmat->nsegments, + dmat->segments = + (bus_dma_segment_t *)mallocarray(dmat->nsegments, sizeof(bus_dma_segment_t), M_BUSDMA, M_NOWAIT); if (dmat->segments == NULL) { CTR3(KTR_BUSDMA, "%s: tag %p error %d", @@ -647,7 +648,8 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddrp, in else mflags = M_WAITOK; if (dmat->segments == NULL) { - dmat->segments = (bus_dma_segment_t *)malloc(dmat->nsegments, + dmat->segments = + (bus_dma_segment_t *)mallocarray(dmat->nsegments, sizeof(bus_dma_segment_t), M_BUSDMA, mflags); if (dmat->segments == NULL) { CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801160604.w0G64eKa091552>