---

yaml --- r: 318202 b: refs/heads/master c: 6e7b4a5 h: refs/heads/master v: v3
git-mirror · Jun 15, 2012 · 3025652 · 3025652
1 parent 13d709a
commit 3025652
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be3a07f71ca3ae300d652a653279321e85b9f3d0
+refs/heads/master: 6e7b4a59b3d7bb2dcd11c019354bf0c91037dadd
diff --git a/trunk/drivers/base/dma-buf.c b/trunk/drivers/base/dma-buf.c
@@ -493,6 +493,7 @@ EXPORT_SYMBOL_GPL(dma_buf_vmap);
 /**
  * dma_buf_vunmap - Unmap a vmap obtained by dma_buf_vmap.
  * @dmabuf:	[in]	buffer to vunmap
+ * @vaddr:	[in]	vmap to vunmap
  */
 void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)
 {

diff --git a/trunk/drivers/base/dma-coherent.c b/trunk/drivers/base/dma-coherent.c
@@ -186,6 +186,7 @@ EXPORT_SYMBOL(dma_release_from_coherent);
  * @vma:	vm_area for the userspace memory
  * @vaddr:	cpu address returned by dma_alloc_from_coherent
  * @size:	size of the memory buffer allocated by dma_alloc_from_coherent
+ * @ret:	result from remap_pfn_range()
  *
  * This checks whether the memory was allocated from the per-device
  * coherent memory pool and if so, maps that memory to the provided vma.