diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2007-07-15 23:40:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 09:05:45 -0700 |
| commit | 1b0fac45878bb88759eec347c273285195649ff7 (patch) | |
| tree | a9871a47ef98c90bac3f65a7f9309e87420c694c /arch | |
| parent | 9e7bf24b1b979db256ddc84d0d4ac6040d706da6 (diff) | |
| download | op-kernel-dev-1b0fac45878bb88759eec347c273285195649ff7.zip op-kernel-dev-1b0fac45878bb88759eec347c273285195649ff7.tar.gz | |
dma-mapping: prevent dma dependent code from linking on !HAS_DMA archs
Continuing the work started in 411f0f3edc141a582190d3605cadd1d993abb6df ...
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: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm26/Kconfig | 3 | ||||
| -rw-r--r-- | arch/h8300/Kconfig | 3 | ||||
| -rw-r--r-- | arch/m32r/Kconfig | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig index 20688bc..9044f33 100644 --- a/arch/arm26/Kconfig +++ b/arch/arm26/Kconfig @@ -17,6 +17,9 @@ config MMU bool default y +config NO_DMA + def_bool y + config ARCH_ACORN bool default y diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 618dbad..e35f74e 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -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 diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index c3bb8a75..8ccf3e4 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -31,6 +31,9 @@ config GENERIC_IRQ_PROBE config NO_IOPORT def_bool y +config NO_DMA + def_bool y + source "init/Kconfig" |
