The patch titled Subject: h8300: dma-mapping: use unsigned long for dma_attrs has been added to the -mm tree. Its filename is h8300-dma-mapping-use-unsigned-long-for-dma_attrs.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/h8300-dma-mapping-use-unsigned-long-for-dma_attrs.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/h8300-dma-mapping-use-unsigned-long-for-dma_attrs.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: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx> Subject: h8300: dma-mapping: use unsigned long for dma_attrs Split out subsystem specific changes for easier reviews. This will be squashed with main commit. Link: http://lkml.kernel.org/r/1467275171-6298-25-git-send-email-k.kozlowski@xxxxxxxxxxx Signed-off-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/h8300/kernel/dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN arch/h8300/kernel/dma.c~h8300-dma-mapping-use-unsigned-long-for-dma_attrs arch/h8300/kernel/dma.c --- a/arch/h8300/kernel/dma.c~h8300-dma-mapping-use-unsigned-long-for-dma_attrs +++ a/arch/h8300/kernel/dma.c @@ -12,7 +12,7 @@ static void *dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, - struct dma_attrs *attrs) + unsigned long attrs) { void *ret; @@ -32,7 +32,7 @@ static void *dma_alloc(struct device *de static void dma_free(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, - struct dma_attrs *attrs) + unsigned long attrs) { free_pages((unsigned long)vaddr, get_order(size)); @@ -41,14 +41,14 @@ static void dma_free(struct device *dev, static dma_addr_t map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { return page_to_phys(page) + offset; } static int map_sg(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) + unsigned long attrs) { struct scatterlist *sg; int i; _ Patches currently in -mm which might be from k.kozlowski@xxxxxxxxxxx are dma-mapping-use-unsigned-long-for-dma_attrs.patch alpha-dma-mapping-use-unsigned-long-for-dma_attrs.patch arc-dma-mapping-use-unsigned-long-for-dma_attrs.patch arm-dma-mapping-use-unsigned-long-for-dma_attrs.patch arm64-dma-mapping-use-unsigned-long-for-dma_attrs.patch avr32-dma-mapping-use-unsigned-long-for-dma_attrs.patch blackfin-dma-mapping-use-unsigned-long-for-dma_attrs.patch c6x-dma-mapping-use-unsigned-long-for-dma_attrs.patch cris-dma-mapping-use-unsigned-long-for-dma_attrs.patch frv-dma-mapping-use-unsigned-long-for-dma_attrs.patch drm-exynos-dma-mapping-use-unsigned-long-for-dma_attrs.patch drm-mediatek-dma-mapping-use-unsigned-long-for-dma_attrs.patch drm-msm-dma-mapping-use-unsigned-long-for-dma_attrs.patch drm-nouveau-dma-mapping-use-unsigned-long-for-dma_attrs.patch drm-rockship-dma-mapping-use-unsigned-long-for-dma_attrs.patch infiniband-dma-mapping-use-unsigned-long-for-dma_attrs.patch iommu-dma-mapping-use-unsigned-long-for-dma_attrs.patch xen-dma-mapping-use-unsigned-long-for-dma_attrs.patch swiotlb-dma-mapping-use-unsigned-long-for-dma_attrs.patch powerpc-dma-mapping-use-unsigned-long-for-dma_attrs.patch video-dma-mapping-use-unsigned-long-for-dma_attrs.patch x86-dma-mapping-use-unsigned-long-for-dma_attrs.patch iommu-intel-dma-mapping-use-unsigned-long-for-dma_attrs.patch h8300-dma-mapping-use-unsigned-long-for-dma_attrs.patch hexagon-dma-mapping-use-unsigned-long-for-dma_attrs.patch ia64-dma-mapping-use-unsigned-long-for-dma_attrs.patch m68k-dma-mapping-use-unsigned-long-for-dma_attrs.patch metag-dma-mapping-use-unsigned-long-for-dma_attrs.patch microblaze-dma-mapping-use-unsigned-long-for-dma_attrs.patch mips-dma-mapping-use-unsigned-long-for-dma_attrs.patch mn10300-dma-mapping-use-unsigned-long-for-dma_attrs.patch nios2-dma-mapping-use-unsigned-long-for-dma_attrs.patch openrisc-dma-mapping-use-unsigned-long-for-dma_attrs.patch parisc-dma-mapping-use-unsigned-long-for-dma_attrs.patch misc-mic-dma-mapping-use-unsigned-long-for-dma_attrs.patch s390-dma-mapping-use-unsigned-long-for-dma_attrs.patch sh-dma-mapping-use-unsigned-long-for-dma_attrs.patch sparc-dma-mapping-use-unsigned-long-for-dma_attrs.patch tile-dma-mapping-use-unsigned-long-for-dma_attrs.patch unicore32-dma-mapping-use-unsigned-long-for-dma_attrs.patch xtensa-dma-mapping-use-unsigned-long-for-dma_attrs.patch dma-mapping-remove-dma_get_attr.patch dma-mapping-document-the-dma-attributes-next-to-the-declaration.patch dma-mapping-constify-attrs-passed-to-dma_get_attr.patch arm-dma-mapping-constify-attrs-passed-to-internal-functions.patch arm64-dma-mapping-constify-attrs-passed-to-internal-functions.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