]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
MIPS: only select ARCH_HAS_UNCACHED_SEGMENT for non-coherent platforms
authorChristoph Hellwig <hch@lst.de>
Sun, 30 Jun 2019 16:43:47 +0000 (18:43 +0200)
committerChristoph Hellwig <hch@lst.de>
Wed, 3 Jul 2019 22:29:52 +0000 (15:29 -0700)
While mips might architecturally have the uncached segment all the time,
the infrastructure to use it is only need on platforms where DMA is
at least partially incoherent.  Only select it for those configuration
to fix a build failure as the arch_dma_prep_coherent symbol is also only
provided for non-coherent platforms.

Fixes: 2e96e04d25ca ("MIPS: use the generic uncached segment support in dma-direct")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Paul Burton <paul.burton@mips.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
arch/mips/Kconfig

index 61a390c2f2c114cbbf0d3d152586a32115ea912b..caf480275a31b7ddecabee7ea4b1a603ad43f4ef 100644 (file)
@@ -8,7 +8,6 @@ config MIPS
        select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_HAS_UBSAN_SANITIZE_ALL
-       select ARCH_HAS_UNCACHED_SEGMENT
        select ARCH_SUPPORTS_UPROBES
        select ARCH_USE_BUILTIN_BSWAP
        select ARCH_USE_CMPXCHG_LOCKREF if 64BIT
@@ -1120,6 +1119,7 @@ config DMA_NONCOHERENT
        bool
        select ARCH_HAS_DMA_MMAP_PGPROT
        select ARCH_HAS_SYNC_DMA_FOR_DEVICE
+       select ARCH_HAS_UNCACHED_SEGMENT
        select NEED_DMA_MAP_STATE
        select ARCH_HAS_DMA_COHERENT_TO_PFN
        select DMA_NONCOHERENT_CACHE_SYNC