Date: Fri, 15 Feb 2013 23:41:48 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r246859 - head/sys/arm/arm Message-ID: <201302152341.r1FNfmcA047314@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Fri Feb 15 23:41:47 2013 New Revision: 246859 URL: http://svnweb.freebsd.org/changeset/base/246859 Log: Set map->pmap before _bus_dmamap_count_pages() tries to use it. Obtained from: Thomas Skibo <ThomasSkibo@sbcglobal.net> Modified: head/sys/arm/arm/busdma_machdep-v6.c Modified: head/sys/arm/arm/busdma_machdep-v6.c ============================================================================== --- head/sys/arm/arm/busdma_machdep-v6.c Fri Feb 15 23:12:58 2013 (r246858) +++ head/sys/arm/arm/busdma_machdep-v6.c Fri Feb 15 23:41:47 2013 (r246859) @@ -968,6 +968,8 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm if (segs == NULL) segs = dmat->segments; + map->pmap = pmap; + if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) { _bus_dmamap_count_pages(dmat, map, buf, buflen, flags); if (map->pagesneeded != 0) { @@ -979,7 +981,6 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm sl = NULL; vaddr = (vm_offset_t)buf; - map->pmap = pmap; while (buflen > 0) { /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302152341.r1FNfmcA047314>