34c34
< __FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep-v6.c 247776 2013-03-04 10:41:54Z cognet $");
---
> __FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep-v6.c 248655 2013-03-23 17:17:06Z ian $");
1153,1163c1153,1159
< /* if buffer was from user space, it it possible that this
< * is not the same vm map. The fix is to map each page in
< * the buffer into the current address space (KVM) and then
< * do the bounce copy or sync list cache operation.
< *
< * The sync list entries are already broken into
< * their respective physical pages.
< */
< if (!pmap_dmap_iscurrent(map->pmap))
< printf("_bus_dmamap_sync: wrong user map: %p %x\n", map->pmap, op);
<
---
> /*
> * If the buffer was from user space, it is possible that this is not
> * the same vm map, especially on a POST operation. It's not clear that
> * dma on userland buffers can work at all right now, certainly not if a
> * partial cacheline flush has to be handled. To be safe, until we're
> * able to test direct userland dma, panic on a map mismatch.
> */
1165c1161,1162
<
---
> if (!pmap_dmap_iscurrent(map->pmap))
> panic("_bus_dmamap_sync: wrong user map for bounce sync.");
1191,1193d1187
< if (!pmap_dmap_iscurrent(map->pmap))
< panic("_bus_dmamap_sync: wrong user map. apply fix");
<
1232a1227,1228
> if (!pmap_dmap_iscurrent(map->pmap))
> panic("_bus_dmamap_sync: wrong user map for sync.");
1306,1307d1301
< if (!pmap_dmap_iscurrent(map->pmap))
< panic("_bus_dmamap_sync: wrong user map. apply fix");