diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-28 21:30:25 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-28 21:30:25 +0400 |
| commit | daf543b177835e42a806439346d367dafeb3a1d3 (patch) | |
| tree | 66d14e77194681abaa6ae9ec36fa2ea86f547885 /include | |
| parent | 521bd5e4d9e6eb7e3c76c615d650a2b5ad0f03f5 (diff) | |
| parent | 1f58d9465c568eb47cab939bbc4f30ae51863295 (diff) | |
| download | linux-daf543b177835e42a806439346d367dafeb3a1d3.tar.xz | |
Merge tag 'for-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf
Pull dma-buf fixes from Sumit Semwal:
"The major changes for 3.17 already went via Greg-KH's tree this time
as well; this is a small pull request for dma-buf - all documentation
related"
* tag 'for-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
dma-buf/fence: Fix one more kerneldoc warning
dma-buf/fence: Fix a kerneldoc warning
Documentation/dma-buf-sharing.txt: update API descriptions
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/seqno-fence.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/seqno-fence.h b/include/linux/seqno-fence.h index 3d6003de4b0d..a1ba6a5ccdd6 100644 --- a/include/linux/seqno-fence.h +++ b/include/linux/seqno-fence.h @@ -62,6 +62,7 @@ to_seqno_fence(struct fence *fence) * @context: the execution context this fence is a part of * @seqno_ofs: the offset within @sync_buf * @seqno: the sequence # to signal on + * @cond: fence wait condition * @ops: the fence_ops for operations on this seqno fence * * This function initializes a struct seqno_fence with passed parameters, |