Re: 2.6.29 -mm merge plans

["KOSAKI Motohiro" <kosaki.motohiro@gmail.com>]

>> m68knommu-use-the-new-byteorder-headers.patch
>> m68knommu-set-no_dma.patch
>>
>>   Architecture things.  Will merge.
>
> I have an m68nommu tree as part of linux-next should these go there?
> (though the last - still outstanding - commit was in November).

I guess m68knommu-set-no_dma.patch isn't right and pci code in
m68knommu use DMA.
because ..

arch/m64knommu/include/asm/dma-mapping.h is

---------------------------------------------------
#ifndef _M68KNOMMU_DMA_MAPPING_H
#define _M68KNOMMU_DMA_MAPPING_H

#ifdef CONFIG_PCI
#include <asm-generic/dma-mapping.h>
#else
#include <asm-generic/dma-mapping-broken.h>
#endif

#endif  /* _M68KNOMMU_DMA_MAPPING_H */
---------------------------------------------------

At least, original author think m68k pci driver use dma.

Recently, I propose following patch.
but nobody replay it ;)


but I also guess it doesn't matter because I guess nobody use m68knommu now ;-/




Subject: [PATCH for 2.6.28 stable] m68knommu: fix m68knommu defconfig
can't build
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: 2008/12/30 19:44

>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@davemloft.net>
>CC: Geert Uytterhoeven <geert@linux-m68k.org>
>CC: Roman Zippel <zippel@linux-m68k.org>
>CC: Greg Ungerer <gerg@uclinux.org>
>CC: linux-m68k@lists.linux-m68k.org
>---
> 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"