diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-28 19:43:13 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-28 19:43:13 -0800 |
commit | 5e04f4b4290e03deb91b074087ae8d7c169d947d (patch) | |
tree | 07802848a6afce236de7c3185be06db8567b38f0 /include | |
parent | b6669737d3db7df79fad07180837c23dbe581db5 (diff) | |
parent | 495c10cc1c0c359871d5bef32dd173252fc17995 (diff) | |
download | op-kernel-dev-5e04f4b4290e03deb91b074087ae8d7c169d947d.zip op-kernel-dev-5e04f4b4290e03deb91b074087ae8d7c169d947d.tar.gz |
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
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/dma-buf.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 3d754a3..9978b61 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; }; |