Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b0fac45 authored by Dan Williams's avatar Dan Williams Committed by Linus Torvalds
Browse files

dma-mapping: prevent dma dependent code from linking on !HAS_DMA archs 



Continuing the work started in 411f0f3e ...

This enables code with a dma path, that compiles away, to build without
requiring additional code factoring.  It also prevents code that calls
dma_alloc_coherent and dma_free_coherent from linking whereas previously
the code would hit a BUG() at run time.  Finally, it allows archs that set
!HAS_DMA to delete their asm/dma-mapping.h file.

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: John W. Linville <linville@tuxdriver.com>
Cc: Kyle McMartin <kyle@parisc-linux.org>
Cc: James Bottomley <James.Bottomley@SteelEye.com>
Cc: Tejun Heo <htejun@gmail.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: <geert@linux-m68k.org>
Cc: <zippel@linux-m68k.org>
Cc: <spyro@f2s.com>
Cc: <ysato@users.sourceforge.jp>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9e7bf24b

arch/arm26/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ config MMU 
	bool

	default y



config NO_DMA

	def_bool y



config ARCH_ACORN

        bool

        default y

arch/h8300/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ config TIME_LOW_RES 
config NO_IOPORT

	def_bool y



config NO_DMA

	def_bool y



config ISA

	bool

	default y

arch/m32r/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ config GENERIC_IRQ_PROBE 
config NO_IOPORT

	def_bool y



config NO_DMA

	def_bool y



source "init/Kconfig"

drivers/dma/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



menu "DMA Engine support"

	depends on !S390

	depends on HAS_DMA



config DMA_ENGINE

	bool "Support for DMA engines"

include/asm-arm26/dma-mapping.h

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
#include <asm-generic/dma-mapping-broken.h>