diff options
Diffstat (limited to 'backport/backport-include/linux/dma-buf.h')
| -rw-r--r-- | backport/backport-include/linux/dma-buf.h | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/backport/backport-include/linux/dma-buf.h b/backport/backport-include/linux/dma-buf.h index 07ac0b4a..48c2ebf5 100644 --- a/backport/backport-include/linux/dma-buf.h +++ b/backport/backport-include/linux/dma-buf.h @@ -8,47 +8,13 @@ #include <linux/dma-attrs.h> #include <linux/dma-mapping.h> -#if !defined(DEFINE_DMA_BUF_EXPORT_INFO) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) -/** - * helper macro for exporters; zeros and fills in most common values - */ -#define DEFINE_DMA_BUF_EXPORT_INFO(a) \ - struct dma_buf_export_info a = { .exp_name = KBUILD_MODNAME } - -struct dma_buf_export_info { - const char *exp_name; - const struct dma_buf_ops *ops; - size_t size; - int flags; - struct reservation_object *resv; - void *priv; -}; - -#ifdef dma_buf_export -#undef dma_buf_export -#endif - -static inline -struct dma_buf *backport_dma_buf_export(const struct dma_buf_export_info *exp_info) -{ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) - return dma_buf_export(exp_info->priv, - (struct dma_buf_ops *)exp_info->ops, - exp_info->size, exp_info->flags); -#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) - return dma_buf_export(exp_info->priv, exp_info->ops, - exp_info->size, exp_info->flags); +#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) - return dma_buf_export_named(exp_info->priv, exp_info->ops, - exp_info->size, exp_info->flags, - exp_info->exp_name); -#else - return dma_buf_export_named(exp_info->priv, exp_info->ops, - exp_info->size, exp_info->flags, - exp_info->exp_name, exp_info->resv); -#endif -} -#define dma_buf_export LINUX_BACKPORT(dma_buf_export) -#endif /* !defined(DEFINE_DMA_BUF_EXPORT_INFO) */ +#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__ */ |