|
@@ -127,33 +127,9 @@ static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp)
|
|
|
|
|
|
#define dma_alloc_coherent(d,s,h,f) dma_alloc_attrs(d,s,h,f,NULL)
|
|
|
|
|
|
-static inline void *
|
|
|
+void *
|
|
|
dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,
|
|
|
- gfp_t gfp, struct dma_attrs *attrs)
|
|
|
-{
|
|
|
- struct dma_map_ops *ops = get_dma_ops(dev);
|
|
|
- void *memory;
|
|
|
-
|
|
|
- gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
|
|
|
-
|
|
|
- if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))
|
|
|
- return memory;
|
|
|
-
|
|
|
- if (!dev)
|
|
|
- dev = &x86_dma_fallback_dev;
|
|
|
-
|
|
|
- if (!is_device_dma_capable(dev))
|
|
|
- return NULL;
|
|
|
-
|
|
|
- if (!ops->alloc)
|
|
|
- return NULL;
|
|
|
-
|
|
|
- memory = ops->alloc(dev, size, dma_handle,
|
|
|
- dma_alloc_coherent_gfp_flags(dev, gfp), attrs);
|
|
|
- debug_dma_alloc_coherent(dev, size, *dma_handle, memory);
|
|
|
-
|
|
|
- return memory;
|
|
|
-}
|
|
|
+ gfp_t gfp, struct dma_attrs *attrs);
|
|
|
|
|
|
#define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)
|
|
|
|