From bb8da35d8b09984a51f2b0c57a259ba9b4a3f915 Mon Sep 17 00:00:00 2001 From: Yasunori Goto Date: Tue, 3 Feb 2009 10:52:03 +0900 Subject: [PATCH] --- yaml --- r: 138908 b: refs/heads/master c: 0d688da5505d77bcef2441e0a22d8cc26459702d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/include/asm/dma-mapping.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c7b535461dd5..83c35d34774c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7ab5c46ae2743079a40bb4060e510418c0842b4 +refs/heads/master: 0d688da5505d77bcef2441e0a22d8cc26459702d diff --git a/trunk/arch/ia64/include/asm/dma-mapping.h b/trunk/arch/ia64/include/asm/dma-mapping.h index abe52575e905..36c0009dbece 100644 --- a/trunk/arch/ia64/include/asm/dma-mapping.h +++ b/trunk/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,