From 4566d6af3823839b19370259ea8477f3abb0a41e Mon Sep 17 00:00:00 2001 From: Shravan Karthik Date: Thu, 25 Oct 2018 18:24:25 +0530 Subject: module: cmemk: Modifications to dmabuf operations for Linux Kernel > v4.18 From kernel versions 4.18, the map_atomic, unmap_atomic interfaces are removed. The device parameter for the attach callback is also removed. Signed-off-by: Shravan Karthik Signed-off-by: Sam Nelson --- src/cmem/module/cmemk.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/cmem/module/cmemk.c b/src/cmem/module/cmemk.c index e4ef13b..507872d 100644 --- a/src/cmem/module/cmemk.c +++ b/src/cmem/module/cmemk.c @@ -1250,9 +1250,14 @@ static void cmem_dma_buf_end_cpu_access(struct dma_buf *dmabuf, #endif } +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)) static int cmem_dmabuf_map_attach(struct dma_buf *dma_buf, struct device *target_dev, struct dma_buf_attachment *attach) +#else +static int cmem_dmabuf_map_attach(struct dma_buf *dma_buf, + struct dma_buf_attachment *attach) +#endif { struct cmem_dmabuf_attachment *cmem_dmabuf_attach; @@ -1380,8 +1385,10 @@ static const struct dma_buf_ops cmem_dmabuf_ops = { .kmap = cmem_dma_buf_kmap, .kunmap = cmem_dma_buf_kunmap, #else +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)) .map_atomic = cmem_dma_buf_kmap, .unmap_atomic = cmem_dma_buf_kunmap, +#endif .map = cmem_dma_buf_kmap, .unmap = cmem_dma_buf_kunmap, #endif -- cgit v1.2.3