33c33
< __FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep.c 254025 2013-08-07 06:21:20Z jeff $");
---
> __FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep.c 257201 2013-10-27 03:13:26Z ian $");
125d124
< vm_offset_t vaddr_nocache; /* kva of bounce buffer uncached */
1199,1203c1198,1199
< bcopy((void *)bpage->datavaddr,
< (void *)(bpage->vaddr_nocache != 0 ?
< bpage->vaddr_nocache :
< bpage->vaddr),
< bpage->datacount);
---
> bcopy((void *)bpage->datavaddr,
> (void *)bpage->vaddr, bpage->datacount);
1206,1215c1202,1204
< (void *)(bpage->vaddr_nocache != 0 ?
< bpage->vaddr_nocache :
< bpage->vaddr),
< bpage->datacount);
< if (bpage->vaddr_nocache == 0) {
< cpu_dcache_wb_range(bpage->vaddr,
< bpage->datacount);
< cpu_l2cache_wb_range(bpage->vaddr,
< bpage->datacount);
< }
---
> (void *)bpage->vaddr,bpage->datacount);
> cpu_dcache_wb_range(bpage->vaddr, bpage->datacount);
> cpu_l2cache_wb_range(bpage->vaddr, bpage->datacount);
1219,1224c1208,1209
< if (bpage->vaddr_nocache == 0) {
< cpu_dcache_inv_range(bpage->vaddr,
< bpage->datacount);
< cpu_l2cache_inv_range(bpage->vaddr,
< bpage->datacount);
< }
---
> cpu_dcache_inv_range(bpage->vaddr, bpage->datacount);
> cpu_l2cache_inv_range(bpage->vaddr, bpage->datacount);
1226,1227c1211
< bcopy((void *)(bpage->vaddr_nocache != 0 ?
< bpage->vaddr_nocache : bpage->vaddr),
---
> bcopy((void *)bpage->vaddr,
1230,1231c1214
< physcopyin((void *)(bpage->vaddr_nocache != 0 ?
< bpage->vaddr_nocache : bpage->vaddr),
---
> physcopyin((void *)bpage->vaddr,
1388,1389d1370
< bpage->vaddr_nocache = (vm_offset_t)arm_remap_nocache(
< (void *)bpage->vaddr, PAGE_SIZE);