[PATCH for 2.6.28 stable] m68knommu: fix m68knommu defconfig can't build

[KOSAKI Motohiro]

I guess nobody don't test m68knommu at all last three month.
Do we still need to maintain this architecture?


==
Currently, m68knommu defconfig can't build. it cause following error.

net/built-in.o: In function `skb_dma_map':
: undefined reference to `dma_mapping_error'
net/built-in.o: In function `skb_dma_unmap':
: undefined reference to `dma_unmap_single'
net/built-in.o: In function `skb_dma_unmap':
: undefined reference to `dma_unmap_page'
net/built-in.o: In function `skb_dma_map':
: undefined reference to `dma_map_single'
net/built-in.o: In function `skb_dma_map':
: undefined reference to `dma_map_page'
net/built-in.o: In function `skb_dma_map':
: undefined reference to `dma_unmap_page'
net/built-in.o: In function `skb_dma_map':
: undefined reference to `dma_unmap_single'

because
 - CONFIG_DMA depend on !NO_DMA
 - m68knommu always doesn't turn on NO_DMA
 - if CONFIG_PCI=n, m68knommu/include/asm/dma-magging.h include
    asm-generic/dma-mapping-broken.h
 - dma-mapping-broken.h generate link time error.
 - m68knommu defconfig doesn't have CONFIG_PCI
 - On the other hand, net/core/skb_dma_map.c assume CONFIG_DMA=y mean
   dma related function is callable

So, we want to turn on CONFIG_DMA if CONFIG_PCI=y only.


CC: David S. Miller <davem@xxxxxxxxxxxxx>
CC: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
CC: Roman Zippel <zippel@xxxxxxxxxxxxxx>
CC: Greg Ungerer <gerg@xxxxxxxxxxx>
CC: linux-m68k@xxxxxxxxxxxxxxxxxxxx
---
 arch/m68knommu/Kconfig |    3 +++
 1 file changed, 3 insertions(+)

Index: b/arch/m68knommu/Kconfig
===================================================================
--- a/arch/m68knommu/Kconfig	2008-12-25 08:26:37.000000000 +0900
+++ b/arch/m68knommu/Kconfig	2008-12-28 21:09:58.000000000 +0900
@@ -73,6 +73,9 @@ config GENERIC_CLOCKEVENTS
 config NO_IOPORT
 	def_bool y
 
+config NO_DMA
+	def_bool !PCI
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/