shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "UPSTREAM: dma-buf: Fix SET_NAME ioctl uapi"

Browse Source 
This reverts commit 97fd895541.

Relpaced by commit 06931a5d14 ("UPSTREAM: dma-buf: Fix SET_NAME ioctl uapi").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8623aa664bca0c41967a14b7f2247927c0b26151
This commit is contained in:
Tao Huang
2021-06-10 18:36:21 +08:00
parent 9ebbcf1dc0
commit 62df34992b
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/dma-buf/dma-buf.c
View File

@@ -442,8 +442,7 @@ static long dma_buf_ioctl(struct file *file,
return ret;
case DMA_BUF_SET_NAME_A:
case DMA_BUF_SET_NAME_B:
case DMA_BUF_SET_NAME:
return dma_buf_set_name(dmabuf, (const char __user *)arg);
case DMA_BUF_IOCTL_SYNC_PARTIAL:

6
include/uapi/linux/dma-buf.h
View File

@@ -41,13 +41,7 @@ struct dma_buf_sync {
#define DMA_BUF_BASE 'b'
#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync)
/* 32/64bitness of this uapi was botched in android, there's no difference
* between them in actual uapi, they're just different numbers.
*/
#define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *)
#define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, u32)
#define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, u64)
struct dma_buf_sync_partial {
__u64 flags;