The patch titled sparc: add sync_single_for_device and sync_sg_for_device to struct dma_ops has been removed from the -mm tree. Its filename was sparc-add-sync_single_for_device-and-sync_sg_for_device-to-struct-dma_ops.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: sparc: add sync_single_for_device and sync_sg_for_device to struct dma_ops From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> This adds sync_single_for_device() and sync_sg_for_device() to struct dma_ops in order to unify dma-mpping_{32|64}.h. dma-mpping_32.h needs them though dma-mpping_64.h doesn't. Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Tested-by: Robert Reif <reif@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/sparc/include/asm/dma-mapping_64.h | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN arch/sparc/include/asm/dma-mapping_64.h~sparc-add-sync_single_for_device-and-sync_sg_for_device-to-struct-dma_ops arch/sparc/include/asm/dma-mapping_64.h --- a/arch/sparc/include/asm/dma-mapping_64.h~sparc-add-sync_single_for_device-and-sync_sg_for_device-to-struct-dma_ops +++ a/arch/sparc/include/asm/dma-mapping_64.h @@ -23,9 +23,15 @@ struct dma_ops { void (*sync_single_for_cpu)(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction direction); + void (*sync_single_for_device)(struct device *dev, + dma_addr_t dma_handle, size_t size, + enum dma_data_direction direction); void (*sync_sg_for_cpu)(struct device *dev, struct scatterlist *sg, int nelems, enum dma_data_direction direction); + void (*sync_sg_for_device)(struct device *dev, + struct scatterlist *sg, int nents, + enum dma_data_direction dir); }; extern const struct dma_ops *dma_ops; _ Patches currently in -mm which might be from fujita.tomonori@xxxxxxxxxxxxx are origin.patch linux-next.patch ib-mthca-replace-dma_sync_single-with-dma_sync_single_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