2014-06-17 17:07:42

by Mark Salter

[permalink] [raw]
Subject: [PATCH] arm64: remove define of ARCH_HAS_DMA_GET_REQUIRED_MASK

Arm64 defines ARCH_HAS_DMA_GET_REQUIRED_MASK but provides
no dma_get_required_mask() function. This leads to a link
error in drivers using dma_get_required_mask(). Remove the
define so the default dma_get_required_mask() is available.

Signed-off-by: Mark Salter <[email protected]>
---
arch/arm64/include/asm/dma-mapping.h | 2 --
1 file changed, 2 deletions(-)

diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h
index 3a4572e..dc82e52 100644
--- a/arch/arm64/include/asm/dma-mapping.h
+++ b/arch/arm64/include/asm/dma-mapping.h
@@ -26,8 +26,6 @@
#include <xen/xen.h>
#include <asm/xen/hypervisor.h>

-#define ARCH_HAS_DMA_GET_REQUIRED_MASK
-
#define DMA_ERROR_CODE (~(dma_addr_t)0)
extern struct dma_map_ops *dma_ops;
extern struct dma_map_ops coherent_swiotlb_dma_ops;
--
1.9.0


2014-06-18 10:13:32

by Catalin Marinas

[permalink] [raw]
Subject: Re: [PATCH] arm64: remove define of ARCH_HAS_DMA_GET_REQUIRED_MASK

On Tue, Jun 17, 2014 at 06:07:03PM +0100, Mark Salter wrote:
> Arm64 defines ARCH_HAS_DMA_GET_REQUIRED_MASK but provides
> no dma_get_required_mask() function. This leads to a link
> error in drivers using dma_get_required_mask(). Remove the
> define so the default dma_get_required_mask() is available.
>
> Signed-off-by: Mark Salter <[email protected]>

I already got a similar patch to push in -rc2.

Thanks.

--
Catalin