---

yaml --- r: 112569 b: refs/heads/master c: 3a80b6a h: refs/heads/master i: 112567: 4461795 v: v3
git-mirror · Sep 8, 2008 · 6f55b52 · 6f55b52
1 parent f276e83
commit 6f55b52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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,