The patch titled Subject: lib/dma-debug.c: use offset_in_page() macro has been added to the -mm tree. Its filename is dma-debug-use-offset_in_page-macro.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/dma-debug-use-offset_in_page-macro.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/dma-debug-use-offset_in_page-macro.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Geliang Tang <geliangtang@xxxxxxxxx> Subject: lib/dma-debug.c: use offset_in_page() macro Use offset_in_page() macro instead of open-coding. Link: http://lkml.kernel.org/r/a23e2178bef0fea63f24995b5086a0d4ed82061e.1492757182.git.geliangtang@xxxxxxxxx Signed-off-by: Geliang Tang <geliangtang@xxxxxxxxx> Cc: Dan Williams <dan.j.williams@xxxxxxxxx> Cc: Vinod Koul <vinod.koul@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/dma-debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN lib/dma-debug.c~dma-debug-use-offset_in_page-macro lib/dma-debug.c --- a/lib/dma-debug.c~dma-debug-use-offset_in_page-macro +++ a/lib/dma-debug.c @@ -1498,7 +1498,7 @@ void debug_dma_alloc_coherent(struct dev entry->type = dma_debug_coherent; entry->dev = dev; entry->pfn = page_to_pfn(virt_to_page(virt)); - entry->offset = (size_t) virt & ~PAGE_MASK; + entry->offset = offset_in_page(virt); entry->size = size; entry->dev_addr = dma_addr; entry->direction = DMA_BIDIRECTIONAL; @@ -1514,7 +1514,7 @@ void debug_dma_free_coherent(struct devi .type = dma_debug_coherent, .dev = dev, .pfn = page_to_pfn(virt_to_page(virt)), - .offset = (size_t) virt & ~PAGE_MASK, + .offset = offset_in_page(virt), .dev_addr = addr, .size = size, .direction = DMA_BIDIRECTIONAL, _ Patches currently in -mm which might be from geliangtang@xxxxxxxxx are fs-ocfs2-cluster-use-setup_timer.patch fs-ocfs2-cluster-use-offset_in_page-macro.patch writeback-use-setup_deferrable_timer.patch dmaengine-dmatest-use-offset_in_page-macro.patch dmaengine-mv_xor-use-offset_in_page-macro.patch dma-debug-use-offset_in_page-macro.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