The patch titled powerpc/vio: more fallout from dma_mapping_error API change has been removed from the -mm tree. Its filename was powerpc-vio-more-fallout-from-dma_mapping_error-api-change.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: powerpc/vio: more fallout from dma_mapping_error API change From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> arch/powerpc/kernel/vio.c:533: error: too few arguments to function 'dma_mapping_error' Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/kernel/vio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/powerpc/kernel/vio.c~powerpc-vio-more-fallout-from-dma_mapping_error-api-change arch/powerpc/kernel/vio.c --- a/arch/powerpc/kernel/vio.c~powerpc-vio-more-fallout-from-dma_mapping_error-api-change +++ a/arch/powerpc/kernel/vio.c @@ -530,7 +530,7 @@ static dma_addr_t vio_dma_iommu_map_sing } ret = dma_iommu_ops.map_single(dev, vaddr, size, direction, attrs); - if (unlikely(dma_mapping_error(ret))) { + if (unlikely(dma_mapping_error(dev, ret))) { vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE)); atomic_inc(&viodev->cmo.allocs_failed); } _ Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are origin.patch linux-next.patch drivers-mtd-nand-nandsimc-needs-div64h.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html