From a961fcdd5604b05dc089f5f6ee025b48b4114604 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 13 Aug 2024 09:33:05 +0100 Subject: [PATCH] ANDROID: dma-buf: Replicate function definition change to the exported prototype Commit 310ec03841a3 ("dma-buf: align fd_flags and heap_flags with dma_heap_allocation_data") changed the types of two of the function parameters. We need to replicate that change in the public prototype. Fixes the following build error: drivers/dma-buf/dma-heap.c:79:17: error: conflicting types for 'dma_heap_buffer_alloc' 79 | struct dma_buf *dma_heap_buffer_alloc(struct dma_heap *heap, size_t len, Fixes: 310ec03841a3 ("dma-buf: align fd_flags and heap_flags with dma_heap_allocation_data") Signed-off-by: Lee Jones Change-Id: I8c31917bf1b558f098296516d07e71d3fecea412 --- include/linux/dma-heap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h index e40cdf1732e1..864f42efce17 100644 --- a/include/linux/dma-heap.h +++ b/include/linux/dma-heap.h @@ -99,8 +99,8 @@ struct dma_heap *dma_heap_find(const char *name); * This is for internal dma-buf allocations only. */ struct dma_buf *dma_heap_buffer_alloc(struct dma_heap *heap, size_t len, - unsigned int fd_flags, - unsigned int heap_flags); + u32 fd_flags, + u64 heap_flags); /** dma_heap_buffer_free - Free dma_buf allocated by dma_heap_buffer_alloc * @dma_buf: dma_buf to free