ANDROID: Fix !CONFIG_DMA_SHARED_BUFFER build failure
Commit 5dd8a05ba11a ("ANDROID: Don't use current pointer for
per-process dmabuf accounting") changed the argument type for
dma_buf_account_task, dma_buf_unaccount_task, and put_dmabuf_info but
did not update the corresponding no-op implementations in the
!CONFIG_DMA_SHARED_BUFFER section, causing build warnings:
1 warning generated.
common/mm/mmap.c:149:13: error: incompatible pointer types passing 'struct task_dma_buf_info *' to parameter of type 'struct task_struct *' [-Werror,-Wincompatible-pointer-types]
vma->vm_mm->abi_extend->dmabuf_info);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
common/include/linux/dma-buf.h:820:28: note: passing argument to parameter 'task' here
struct task_struct *task) {}
Fixes: 5dd8a05ba11a ("ANDROID: Don't use current pointer for per-process dmabuf accounting")
Bug: 459757379
Bug: 461520624
Bug: 465344738
Change-Id: I727105e230b6b537f7b3621c5aabb1012640f416
Signed-off-by: T.J. Mercier <tjmercier@google.com>
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index 14c8fe5..9a87c89 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -815,13 +815,13 @@ int dma_buf_begin_new_exec(struct files_struct *old_files);
static inline int is_dma_buf_file(struct file *file) { return 0; }
static inline int dma_buf_account_task(struct dma_buf *dmabuf,
- struct task_struct *task) { return 0; }
+ struct task_dma_buf_info *dmabuf_info) { return 0; }
static inline void dma_buf_unaccount_task(struct dma_buf *dmabuf,
- struct task_struct *task) {}
+ struct task_dma_buf_info *dmabuf_info) {}
static inline int copy_dmabuf_info(u64 clone_flags,
struct task_struct *task) { return 0; }
-static inline void put_dmabuf_info(struct task_struct *task) {}
-int dma_buf_begin_new_exec(struct files_struct *old_files) { return 0; }
+static inline void put_dmabuf_info(struct task_dma_buf_info *dmabuf_info) {}
+static inline int dma_buf_begin_new_exec(struct files_struct *old_files) { return 0; }
#endif /* CONFIG_DMA_SHARED_BUFFER */
#endif /* __DMA_BUF_H__ */
