From 6f55b5257757da4b8546099a134f5ae6d35cfabc Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 8 Sep 2008 18:10:10 +0900
Subject: [PATCH] --- yaml --- r: 112569 b: refs/heads/master c:
 3a80b6aa271eb08a3da1a04b5cbdcdc19d4a5ae0 h: refs/heads/master i:   112567:
 446179543e6b6bc4145f1151796cda6d0b121c02 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/ia64/include/asm/dma-mapping.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4e3a410e8572..43695bad1627 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e51af6630848406fc97adbd71443818cdcda297b
+refs/heads/master: 3a80b6aa271eb08a3da1a04b5cbdcdc19d4a5ae0
diff --git a/trunk/arch/ia64/include/asm/dma-mapping.h b/trunk/arch/ia64/include/asm/dma-mapping.h
index 9f0df9bd46b7..06ff1ba21465 100644
--- a/trunk/arch/ia64/include/asm/dma-mapping.h
+++ b/trunk/arch/ia64/include/asm/dma-mapping.h
@@ -8,7 +8,9 @@
 #include <asm/machvec.h>
 #include <linux/scatterlist.h>
 
-#define dma_alloc_coherent	platform_dma_alloc_coherent
+#define dma_alloc_coherent(dev, size, handle, gfp)	\
+	platform_dma_alloc_coherent(dev, size, handle, (gfp) | GFP_DMA)
+
 /* coherent mem. is cheap */
 static inline void *
 dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle,