Merge "Merge android11-5.4.197+ (3970bc6) into msm-5.4"

This commit is contained in:
qctecmdr 2022-08-22 22:49:43 -07:00 • committed by Gerrit - the friendly Code Review server
commit 68eac8ff03
357 changed files with 111890 additions and 113902 deletions

View file

@ -44,7 +44,7 @@ struct dma_buf_sync {
* 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)
#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