diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-06-26 15:02:54 +0400 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-07-16 03:59:22 +0400 |
| commit | b60f187fecee5d9dceb89773e15f976fe21d893a (patch) | |
| tree | d648e433a3f2c62cbe340e227a1ac02a91b9ba59 /arch/m68k | |
| parent | 8b1e5a0626f7f921fe0fa24bdb256ae1de5ab9b0 (diff) | |
| download | linux-b60f187fecee5d9dceb89773e15f976fe21d893a.tar.xz | |
m68k: use simpler dma_alloc_coherent() for ColdFire CPUs
On all ColdFire platforms (whether MMU enabled or not) we want to use the
simple page based dma_alloc_coherent. We don't want the virtual mapping
version that is used on classic m68k setups. So modify the conditionals
to use the existing simpler dma_alloc_coherent on all ColdFire and non-MMU
builds.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/kernel/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c index f6daf6e15d2e..27b5821f9712 100644 --- a/arch/m68k/kernel/dma.c +++ b/arch/m68k/kernel/dma.c @@ -16,7 +16,7 @@ #include <asm/pgalloc.h> -#ifdef CONFIG_MMU +#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE) void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t flag) @@ -96,7 +96,7 @@ void dma_free_coherent(struct device *dev, size_t size, free_pages((unsigned long)vaddr, get_order(size)); } -#endif /* CONFIG_MMU */ +#endif /* CONFIG_MMU && !CONFIG_COLDFIRE */ EXPORT_SYMBOL(dma_alloc_coherent); EXPORT_SYMBOL(dma_free_coherent); |