From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Mar 2012 22:02:41 +0000 (-0700)
Subject: Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
X-Git-Tag: v3.4-rc1~57
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ed0bb8ea059764c3fc882fb135473afd347335e9;p=linux.git

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

Pull dma-buf updates from Sumit Semwal:
 "This includes the following key items:

   - kernel cpu access support,
   - flag-passing to dma_buf_fd,
   - relevant Documentation updates, and
   - some minor cleanups and fixes.

  These changes are needed for the drm prime/dma-buf interface code that
  Dave Airlie plans to submit in this merge window."

* 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
  dma-buf: correct dummy function declarations.
  dma-buf: document fd flags and O_CLOEXEC requirement
  dma_buf: Add documentation for the new cpu access support
  dma-buf: add support for kernel cpu access
  dma-buf: don't hold the mutex around map/unmap calls
  dma-buf: add get_dma_buf()
  dma-buf: pass flags into dma_buf_fd.
  dma-buf: add dma_data_direction to unmap dma_buf_op
  dma-buf: Move code out of mutex-protected section in dma_buf_attach()
  dma-buf: Return error instead of using a goto statement when possible
  dma-buf: Remove unneeded sanity checks
  dma-buf: Constify ops argument to dma_buf_export()
---

ed0bb8ea059764c3fc882fb135473afd347335e9
diff --cc include/linux/dma-buf.h
index 887dcd487062,f141745a13bf..3efbfc2145c3
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@@ -29,8 -29,9 +29,9 @@@
  #include <linux/scatterlist.h>
  #include <linux/list.h>
  #include <linux/dma-mapping.h>
+ #include <linux/fs.h>
  
 +struct device;
  struct dma_buf;
  struct dma_buf_attachment;