aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasunori Goto <y-goto@jp.fujitsu.com>2009-02-03 10:52:03 +0900
committerIngo Molnar <mingo@elte.hu>2009-02-03 06:57:24 +0100
commit0d688da5505d77bcef2441e0a22d8cc26459702d (patch)
treeab71f037ce9953e3652bb617b6b604ed42fa4514
parentd7ab5c46ae2743079a40bb4060e510418c0842b4 (diff)
IA64: fix swiotlb alloc_coherent for non DMA_64BIT_MASK devices, fix
Because dma_alloc_coherent() always required DMA zone even if DMA is NOT necessary, FUJITA Tomonori posted a patch to fix it: http://marc.info/?l=linux-ia64&m=123314730923356&w=2 However, this fix needs one more patch to fix completely. I tested and confirmed dma_alloc_coherent() returns correct zone after applied following patch. Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/ia64/include/asm/dma-mapping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
index abe52575e90..36c0009dbec 100644
--- a/arch/ia64/include/asm/dma-mapping.h
+++ b/arch/ia64/include/asm/dma-mapping.h
@@ -24,7 +24,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *daddr, gfp_t gfp)
{
struct dma_map_ops *ops = platform_dma_get_ops(dev);
- return ops->alloc_coherent(dev, size, daddr, gfp | GFP_DMA);
+ return ops->alloc_coherent(dev, size, daddr, gfp);
}
static inline void dma_free_coherent(struct device *dev, size_t size,