Update arm implementation of DMA API to include GFP_ flags

diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h
index e3d1dbb7bebf98629f58962cc14c11c9303fddbf..757155b13afcefa39d1faf2f74540bfb6d224091 100644 (file)
--- a/include/asm-arm/dma-mapping.h
+++ b/include/asm-arm/dma-mapping.h
@@ -82,10 +82,8 @@ static inline int dma_is_consistent(dma_addr_t handle)
  * device-viewed address.
  */
 static inline void *
-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle)
+dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, int gfp)
 {
-       int gfp = GFP_ATOMIC;
-
        if (dev == NULL || dmadev_is_sa1111(dev) || *dev->dma_mask != 0xffffffff)
                gfp |= GFP_DMA;