diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-02-03 20:12:02 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-02-20 07:26:35 -0700 |
| commit | ff4c25f26a71b79c70ea03b3935a1297439a8a85 (patch) | |
| tree | bb278baf485553d3a73b4de530edcc2287e003a5 /kernel/dma | |
| parent | dma-mapping: remove an incorrect __iommem annotation (diff) | |
| download | linux-dev-ff4c25f26a71b79c70ea03b3935a1297439a8a85.tar.xz linux-dev-ff4c25f26a71b79c70ea03b3935a1297439a8a85.zip | |
dma-mapping: improve selection of dma_declare_coherent availability
This API is primarily used through DT entries, but two architectures
and two drivers call it directly. So instead of selecting the config
symbol for random architectures pull it in implicitly for the actual
users. Also rename the Kconfig option to describe the feature better.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Paul Burton <paul.burton@mips.com> # MIPS
Acked-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/dma')
| -rw-r--r-- | kernel/dma/Kconfig | 2 | ||||
| -rw-r--r-- | kernel/dma/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig index bde9179c6ed7..24d45c78c671 100644 --- a/kernel/dma/Kconfig +++ b/kernel/dma/Kconfig @@ -16,7 +16,7 @@ config ARCH_DMA_ADDR_T_64BIT config ARCH_HAS_DMA_COHERENCE_H bool -config HAVE_GENERIC_DMA_COHERENT +config DMA_DECLARE_COHERENT bool config ARCH_HAS_SETUP_DMA_OPS diff --git a/kernel/dma/Makefile b/kernel/dma/Makefile index 72ff6e46aa86..d237cf3dc181 100644 --- a/kernel/dma/Makefile +++ b/kernel/dma/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_HAS_DMA) += mapping.o direct.o dummy.o obj-$(CONFIG_DMA_CMA) += contiguous.o -obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += coherent.o +obj-$(CONFIG_DMA_DECLARE_COHERENT) += coherent.o obj-$(CONFIG_DMA_VIRT_OPS) += virt.o obj-$(CONFIG_DMA_API_DEBUG) += debug.o obj-$(CONFIG_SWIOTLB) += swiotlb.o |