The patch titled dma-mapping: ia64: add CONFIG_DMA_API_DEBUG support has been added to the -mm tree. Its filename is dma-mapping-ia64-add-config_dma_api_debug-support.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: dma-mapping: ia64: add CONFIG_DMA_API_DEBUG support From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Acked-by: Joerg Roedel <joerg.roedel@xxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: "Luck, Tony" <tony.luck@xxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Cc; "David S. Miller" <davem@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/ia64/Kconfig | 1 + arch/ia64/include/asm/dma-mapping.h | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff -puN arch/ia64/Kconfig~dma-mapping-ia64-add-config_dma_api_debug-support arch/ia64/Kconfig --- a/arch/ia64/Kconfig~dma-mapping-ia64-add-config_dma_api_debug-support +++ a/arch/ia64/Kconfig @@ -28,6 +28,7 @@ config IA64 select HAVE_DMA_ATTRS select HAVE_KVM select HAVE_ARCH_TRACEHOOK + select HAVE_DMA_API_DEBUG default y help The Itanium Processor Family is Intel's 64-bit successor to diff -puN arch/ia64/include/asm/dma-mapping.h~dma-mapping-ia64-add-config_dma_api_debug-support arch/ia64/include/asm/dma-mapping.h --- a/arch/ia64/include/asm/dma-mapping.h~dma-mapping-ia64-add-config_dma_api_debug-support +++ a/arch/ia64/include/asm/dma-mapping.h @@ -8,6 +8,7 @@ #include <asm/machvec.h> #include <linux/scatterlist.h> #include <asm/swiotlb.h> +#include <linux/dma-debug.h> #define ARCH_HAS_DMA_GET_REQUIRED_MASK @@ -24,13 +25,18 @@ static inline void *dma_alloc_coherent(s dma_addr_t *daddr, gfp_t gfp) { struct dma_map_ops *ops = platform_dma_get_ops(dev); - return ops->alloc_coherent(dev, size, daddr, gfp); + void *caddr; + + caddr = ops->alloc_coherent(dev, size, daddr, gfp); + debug_dma_alloc_coherent(dev, size, *daddr, caddr); + return caddr; } static inline void dma_free_coherent(struct device *dev, size_t size, void *caddr, dma_addr_t daddr) { struct dma_map_ops *ops = platform_dma_get_ops(dev); + debug_dma_free_coherent(dev, size, caddr, daddr); ops->free_coherent(dev, size, caddr, daddr); } _ Patches currently in -mm which might be from fujita.tomonori@xxxxxxxxxxxxx are linux-next.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 net-replace-dma_sync_single-with-dma_sync_single_for_cpu.patch sg_io-dont-perform-unneeded-copy-in-compat-code.patch usb-replace-dma_sync_single-and-dma_sync_sg-with-dma_sync_single_for_cpu-and-dma_sync_sg_for_cpu.patch dma-mapping-mark-dma_nbits_mask-as-deprecated.patch dma-mapping-mark-dma_sync_single-and-dma_sync_sg-as-deprecated.patch dma-mapping-add-asm-generic-dma-mapping-commonh.patch dma-mapping-x86-use-asm-generic-dma-mapping-commonh.patch dma-mapping-ia64-use-asm-generic-dma-mapping-commonh.patch dma-mapping-ia64-add-config_dma_api_debug-support.patch dma-mapping-dma-debug-fix-compiler-warnings-on-ia64.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