summaryrefslogtreecommitdiffstats
path: root/Documentation/DMA-API.txt
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-11-07 21:27:23 +0100
committerTony Lindgren <tony@atomide.com>2011-11-07 21:27:23 +0100
commitd30cc16c8e48368e0518f4975a78711e53e14a0f (patch)
tree26b57f7ab5a963cc3d6c57dff6951bd930875583 /Documentation/DMA-API.txt
parentARM: OMAP2: Fix H4 matrix keyboard warning (diff)
parentARM: OMAP: Fix export.h or module.h includes (diff)
downloadlinux-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.xz
linux-d30cc16c8e48368e0518f4975a78711e53e14a0f.zip
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'Documentation/DMA-API.txt')
-rw-r--r--Documentation/DMA-API.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
index fe2326906610..66bd97a95f10 100644
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
@@ -50,6 +50,13 @@ specify the GFP_ flags (see kmalloc) for the allocation (the
implementation may choose to ignore flags that affect the location of
the returned memory, like GFP_DMA).
+void *
+dma_zalloc_coherent(struct device *dev, size_t size,
+ dma_addr_t *dma_handle, gfp_t flag)
+
+Wraps dma_alloc_coherent() and also zeroes the returned memory if the
+allocation attempt succeeded.
+
void
dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
dma_addr_t dma_handle)