diff options
author | Dan Williams <dan.j.williams@intel.com> | 2007-07-16 02:40:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:45 -0400 |
commit | 1b0fac45878bb88759eec347c273285195649ff7 (patch) | |
tree | a9871a47ef98c90bac3f65a7f9309e87420c694c /arch | |
parent | 9e7bf24b1b979db256ddc84d0d4ac6040d706da6 (diff) |
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 20688bc13e9b..9044f33299f7 100644 --- a/arch/arm26/Kconfig +++ b/arch/arm26/Kconfig | |||
@@ -17,6 +17,9 @@ config MMU | |||
17 | bool | 17 | bool |
18 | default y | 18 | default y |
19 | 19 | ||
20 | config NO_DMA | ||
21 | def_bool y | ||
22 | |||
20 | config ARCH_ACORN | 23 | config ARCH_ACORN |
21 | bool | 24 | bool |
22 | default y | 25 | default y |
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 618dbad696f6..e35f74e6e505 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig | |||
@@ -68,6 +68,9 @@ config TIME_LOW_RES | |||
68 | config NO_IOPORT | 68 | config NO_IOPORT |
69 | def_bool y | 69 | def_bool y |
70 | 70 | ||
71 | config NO_DMA | ||
72 | def_bool y | ||
73 | |||
71 | config ISA | 74 | config ISA |
72 | bool | 75 | bool |
73 | default y | 76 | default y |
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index c3bb8a755b00..8ccf3e47bff8 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
@@ -31,6 +31,9 @@ config GENERIC_IRQ_PROBE | |||
31 | config NO_IOPORT | 31 | config NO_IOPORT |
32 | def_bool y | 32 | def_bool y |
33 | 33 | ||
34 | config NO_DMA | ||
35 | def_bool y | ||
36 | |||
34 | source "init/Kconfig" | 37 | source "init/Kconfig" |
35 | 38 | ||
36 | 39 | ||