The patch titled IB/mthca: replace dma_sync_single with dma_sync_single_for_cpu has been added to the -mm tree. Its filename is ib-mthca-replace-dma_sync_single-with-dma_sync_single_for_cpu.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: IB/mthca: replace dma_sync_single with dma_sync_single_for_cpu From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> This replaces dma_sync_single() with dma_sync_single_for_cpu() because dma_sync_single() is an obsolete API; include/linux/dma-mapping.h says: /* Backwards compat, remove in 2.7.x */ #define dma_sync_single dma_sync_single_for_cpu #define dma_sync_sg dma_sync_sg_for_cpu Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Cc: Roland Dreier <rolandd@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/infiniband/hw/mthca/mthca_mr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -puN drivers/infiniband/hw/mthca/mthca_mr.c~ib-mthca-replace-dma_sync_single-with-dma_sync_single_for_cpu drivers/infiniband/hw/mthca/mthca_mr.c --- a/drivers/infiniband/hw/mthca/mthca_mr.c~ib-mthca-replace-dma_sync_single-with-dma_sync_single_for_cpu +++ a/drivers/infiniband/hw/mthca/mthca_mr.c @@ -355,7 +355,8 @@ static void mthca_arbel_write_mtt_seg(st for (i = 0; i < list_len; ++i) mtts[i] = cpu_to_be64(buffer_list[i] | MTHCA_MTT_FLAG_PRESENT); - dma_sync_single(&dev->pdev->dev, dma_handle, list_len * sizeof (u64), DMA_TO_DEVICE); + dma_sync_single_for_cpu(&dev->pdev->dev, dma_handle, + list_len * sizeof (u64), DMA_TO_DEVICE); } int mthca_write_mtt(struct mthca_dev *dev, struct mthca_mtt *mtt, @@ -807,8 +808,8 @@ int mthca_arbel_map_phys_fmr(struct ib_f fmr->mem.arbel.mtts[i] = cpu_to_be64(page_list[i] | MTHCA_MTT_FLAG_PRESENT); - dma_sync_single(&dev->pdev->dev, fmr->mem.arbel.dma_handle, - list_len * sizeof(u64), DMA_TO_DEVICE); + dma_sync_single_for_cpu(&dev->pdev->dev, fmr->mem.arbel.dma_handle, + list_len * sizeof(u64), DMA_TO_DEVICE); fmr->mem.arbel.mpt->key = cpu_to_be32(key); fmr->mem.arbel.mpt->lkey = cpu_to_be32(key); _ Patches currently in -mm which might be from fujita.tomonori@xxxxxxxxxxxxx are linux-next.patch sg_io-dont-perform-unneeded-copy-in-compat-code.patch dma-mapping-mark-dma_nbits_mask-as-deprecated.patch net-replace-dma_sync_single-with-dma_sync_single_for_cpu.patch vino-replace-dma_sync_single-with-dma_sync_single_for_cpu.patch ib-mthca-replace-dma_sync_single-with-dma_sync_single_for_cpu.patch usb-replace-dma_sync_single-and-dma_sync_sg-with-dma_sync_single_for_cpu-and-dma_sync_sg_for_cpu.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