summaryrefslogtreecommitdiff
path: root/backport
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-06-08 17:48:47 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2014-07-23 23:27:46 +0200
commit2955332a104a807fffea4799a97112a0291e3d7c (patch)
treeb47bdd963604f20f11b206299934f84378d62ca0 /backport
parent0596a03b5955b541ef5f1cdfe08fe92238988903 (diff)
backports: remove parameter from dma_buf_export()
dma_buf_export() got a new parameter which is not available in older kernel versions. This was once removed in this commit and is needed again: commit 9981d1abf4b52e84a432fc9bdfbdd30d1838819d Author: Hauke Mehrtens <hauke@hauke-m.de> Date: Mon Jun 16 21:02:25 2014 +0200 backports: Revert "remove parameter from dma_buf_export()" Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'backport')
-rw-r--r--backport/backport-include/linux/dma-buf.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/backport/backport-include/linux/dma-buf.h b/backport/backport-include/linux/dma-buf.h
index 363b86fe..13a225ef 100644
--- a/backport/backport-include/linux/dma-buf.h
+++ b/backport/backport-include/linux/dma-buf.h
@@ -5,4 +5,13 @@
#include_next <linux/dma-buf.h>
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+#define dma_buf_export(priv, ops, size, flags, resv) \
+ dma_buf_export(priv, ops, size, flags)
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
+#undef dma_buf_export
+#define dma_buf_export(priv, ops, size, flags, resv) \
+ dma_buf_export_named(priv, ops, size, flags, KBUILD_MODNAME)
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
+
#endif /* _BACKPORT_DMA_BUF_H__ */