summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-07-14 14:18:55 +0200
committerRich Felker <dalias@libc.org>2020-08-15 04:05:17 +0200
commitcd57d07b1e4e08f95a27b59253b5c8a46abf4f29 (patch)
tree8d33e99707ca843df887efdf6a95341cfa213a4f
parentdma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig (diff)
downloadlinux-cd57d07b1e4e08f95a27b59253b5c8a46abf4f29.tar.xz
linux-cd57d07b1e4e08f95a27b59253b5c8a46abf4f29.zip
sh: don't allow non-coherent DMA for NOMMU
The code handling non-coherent DMA depends on being able to remap code as non-cached. But that can't be done without an MMU, so using this option on NOMMU builds is broken. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Rich Felker <dalias@libc.org>
-rw-r--r--arch/sh/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1bf23e272483..7082a4a499fd 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -61,6 +61,7 @@ config SUPERH
select MAY_HAVE_SPARSE_IRQ
select MODULES_USE_ELF_RELA
select NEED_SG_DMA_LENGTH
+ select NO_DMA if !MMU && !DMA_COHERENT
select NO_GENERIC_PCI_IOPORT_MAP if PCI
select OLD_SIGACTION
select OLD_SIGSUSPEND
@@ -135,7 +136,7 @@ config DMA_COHERENT
bool
config DMA_NONCOHERENT
- def_bool !DMA_COHERENT
+ def_bool !NO_DMA && !DMA_COHERENT
select ARCH_HAS_SYNC_DMA_FOR_DEVICE
config PGTABLE_LEVELS