| From 8029e7b771b420a132fb69034b1375d5ee0d1abf Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 2 Mar 2026 16:23:09 -0800 |
| Subject: dma-buf: Include ioctl.h in UAPI header |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Isaac J. Manjarres <isaacmanjarres@google.com> |
| |
| [ Upstream commit a116bac87118903925108e57781bbfc7a7eea27b ] |
| |
| include/uapi/linux/dma-buf.h uses several macros from ioctl.h to define |
| its ioctl commands. However, it does not include ioctl.h itself. So, |
| if userspace source code tries to include the dma-buf.h file without |
| including ioctl.h, it can result in build failures. |
| |
| Therefore, include ioctl.h in the dma-buf UAPI header. |
| |
| Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com> |
| Reviewed-by: T.J. Mercier <tjmercier@google.com> |
| Reviewed-by: Christian König <christian.koenig@amd.com> |
| Signed-off-by: Christian König <christian.koenig@amd.com> |
| Link: https://lore.kernel.org/r/20260303002309.1401849-1-isaacmanjarres@google.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| include/uapi/linux/dma-buf.h | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h |
| index f76d11725c6c6..dd9fa80184f3e 100644 |
| --- a/include/uapi/linux/dma-buf.h |
| +++ b/include/uapi/linux/dma-buf.h |
| @@ -20,6 +20,7 @@ |
| #ifndef _DMA_BUF_UAPI_H_ |
| #define _DMA_BUF_UAPI_H_ |
| |
| +#include <linux/ioctl.h> |
| #include <linux/types.h> |
| |
| /* begin/end dma-buf functions used for userspace mmap. */ |
| -- |
| 2.51.0 |
| |
