From: Eunok Jo Date: Mon, 22 May 2017 05:44:37 +0000 (+0900) Subject: change dma_attrs to unsigned long X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c53deef789815707b91be831d3349ba949011006;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git change dma_attrs to unsigned long Due to patch "dma-mapping: use unsigned long for dma_attrs", dma_attrs should be unsigned long to be used. Change-Id: Ia68dfee7ff5e4b1e89c921e161bb8891c0278e5e Signed-off-by: Eunok Jo --- diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 6d245950491a..7352d4b306a2 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -387,9 +387,9 @@ static const struct dma_map_ops swiotlb_dma_ops = { }; static void *arm_exynos_dma_mcode_alloc(struct device *dev, size_t size, - dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs); + dma_addr_t *handle, gfp_t gfp, unsigned long attrs); static void arm_exynos_dma_mcode_free(struct device *dev, size_t size, void *cpu_addr, - dma_addr_t handle, struct dma_attrs *attrs); + dma_addr_t handle, unsigned long attrs); struct dma_map_ops arm_exynos_dma_mcode_ops = { .alloc = arm_exynos_dma_mcode_alloc, @@ -398,7 +398,7 @@ struct dma_map_ops arm_exynos_dma_mcode_ops = { EXPORT_SYMBOL(arm_exynos_dma_mcode_ops); static void *arm_exynos_dma_mcode_alloc(struct device *dev, size_t size, - dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs) + dma_addr_t *handle, gfp_t gfp, unsigned long attrs) { void *addr; @@ -411,7 +411,7 @@ static void *arm_exynos_dma_mcode_alloc(struct device *dev, size_t size, } static void arm_exynos_dma_mcode_free(struct device *dev, size_t size, void *cpu_addr, - dma_addr_t handle, struct dma_attrs *attrs) + dma_addr_t handle, unsigned long attrs) { iounmap(cpu_addr); }