From: Hauke Mehrtens Date: Sun, 8 Jun 2014 15:48:47 +0000 (+0200) Subject: backports: remove parameter from dma_buf_export() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2955332a104a807fffea4799a97112a0291e3d7c;p=openwrt%2Fstaging%2Fblogic.git 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 Date: Mon Jun 16 21:02:25 2014 +0200 backports: Revert "remove parameter from dma_buf_export()" Signed-off-by: Hauke Mehrtens --- diff --git a/backport/backport-include/linux/dma-buf.h b/backport/backport-include/linux/dma-buf.h index 363b86fee502..13a225ef745e 100644 --- a/backport/backport-include/linux/dma-buf.h +++ b/backport/backport-include/linux/dma-buf.h @@ -5,4 +5,13 @@ #include_next #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__ */