Commit 62fcee9a authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: remove CONFIG_ARCH_NO_COHERENT_DMA_MMAP 



CONFIG_ARCH_NO_COHERENT_DMA_MMAP is now functionally identical to
!CONFIG_MMU, so remove the separate symbol.  The only difference is that
arm did not set it for !CONFIG_MMU, but arm uses a separate dma mapping
implementation including its own mmap method, which is handled by moving
the CONFIG_MMU check in dma_can_mmap so that is only applies to the
dma-direct case, just as the other ifdefs for it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>	# m68k
parent 5128da32

arch/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -790,9 +790,6 @@ config COMPAT_32BIT_TIME 
	  This is relevant on all 32-bit architectures, and 64-bit architectures

	  as part of compat syscall handling.



config ARCH_NO_COHERENT_DMA_MMAP

	bool



config ARCH_NO_PREEMPT

	bool

arch/c6x/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ config C6X 
	select OF_EARLY_FLATTREE

	select GENERIC_CLOCKEVENTS

	select MODULES_USE_ELF_RELA

	select ARCH_NO_COHERENT_DMA_MMAP

	select MMU_GATHER_NO_RANGE if MMU



config MMU

arch/m68k/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ config M68K 
	select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA

	select ARCH_MIGHT_HAVE_PC_PARPORT if ISA

	select ARCH_NO_COHERENT_DMA_MMAP if !MMU

	select ARCH_NO_PREEMPT if !COLDFIRE

	select BINFMT_FLAT_ARGVP_ENVP_ON_STACK

	select DMA_DIRECT_REMAP if HAS_DMA && MMU && !COLDFIRE

arch/microblaze/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ config MICROBLAZE 
	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_NO_COHERENT_DMA_MMAP if !MMU

	select ARCH_WANT_IPC_PARSE_VERSION

	select BUILDTIME_EXTABLE_SORT

	select TIMER_OF

arch/sh/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ config SUPERH 
	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_NO_COHERENT_DMA_MMAP if !MMU

	select HAVE_PATA_PLATFORM

	select CLKDEV_LOOKUP

	select DMA_DECLARE_COHERENT

CRA Git | Maintained and supported by SUSTech CRA and CCSE