arm64/dma: Removing ARCH_HAS_DMA_GET_REQUIRED_MASK macro
authorSuravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Fri, 6 Jun 2014 22:07:16 +0000 (23:07 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 24 Oct 2014 12:19:04 +0000 (13:19 +0100)
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

arch/arm64/include/asm/dma-mapping.h

index 00a41aab4a37f5b74ca13769b6a57ab8b1145db0..fa6a0c5a8de3e2cc70cb7a5372fc1203b89af383 100644 (file)
@@ -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;