diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-05-08 11:00:22 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2020-05-08 11:00:25 +0300 |
| commit | ed8f854d8ca4681c60122ac76615cb0a0b95305c (patch) | |
| tree | 98d5996b94b4b2f46d866d610878a586ceb95676 /include/uapi | |
| parent | 5c1f0d199b4af813351b4bd1e34b0105dca07ead (diff) | |
| parent | 592465e6a54ba8104969f3b73b58df262c5be5f5 (diff) | |
| download | linux-ed8f854d8ca4681c60122ac76615cb0a0b95305c.tar.xz | |
Merge tag 'v5.4.39' into dev-5.4
This is the 5.4.39 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/dma-buf.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h index dbc7092e04b5..7f30393b92c3 100644 --- a/include/uapi/linux/dma-buf.h +++ b/include/uapi/linux/dma-buf.h @@ -39,6 +39,12 @@ 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) #endif |