Merge tag 'tag-for-linus-3.9' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf

Pull dma-buf framework updates from Sumit Semwal:
 "Refcounting implemented for vmap in core dma-buf"

* tag 'tag-for-linus-3.9' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
  CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap
  dma-buf: implement vmap refcounting in the interface logic

1 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index 3d754a394e92..9978b614a1aa 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -119,8 +119,10 @@ struct dma_buf {
         struct file *file;
         struct list_head attachments;
         const struct dma_buf_ops *ops;
-        /* mutex to serialize list manipulation and attach/detach */
+        /* mutex to serialize list manipulation, attach/detach and vmap/unmap */
         struct mutex lock;
+        unsigned vmapping_counter;
+        void *vmap_ptr;
         void *priv;
 };