diff options
| author | Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> | 2014-06-06 23:07:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-24 13:19:04 +0100 |
| commit | 8198661461a12637b0e934aa83d553c531e3b247 (patch) | |
| tree | 0868a4bcc213647b75db3cc6154270528eb6feb3 | |
| parent | 9efcded7f200e658058bf790e4936aa17a989da7 (diff) | |
arm64/dma: Removing ARCH_HAS_DMA_GET_REQUIRED_MASK macro
Arm64 does not define dma_get_required_mask() function.
Therefore, it should not define the ARCH_HAS_DMA_GET_REQUIRED_MASK.
This causes build errors in some device drivers (e.g. mpt2sas)
Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: <stable@vger.kernel.org>
(cherry picked from commit f3a183cb422574014538017b5b291a416396f97e)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
arch/arm64/include/asm/dma-mapping.h
| -rw-r--r-- | arch/arm64/include/asm/dma-mapping.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h index 00a41aab4a37..fa6a0c5a8de3 100644 --- a/arch/arm64/include/asm/dma-mapping.h +++ b/arch/arm64/include/asm/dma-mapping.h @@ -23,8 +23,6 @@ #include <asm-generic/dma-coherent.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; |