diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-05-21 05:58:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-05-21 06:00:34 +1000 |
| commit | 6e4a61cd39685476f7ea74e75fb66666d541050b (patch) | |
| tree | 823c7eb5544d90a2b5734a2926f08142fa728a80 /include | |
| parent | 4862b74047780ee193cfd3dbcc3dbec6e79d3a5f (diff) | |
| parent | 6e03b13cc7d9427c2c77feed1549191015615202 (diff) | |
| download | nf-6e4a61cd39685476f7ea74e75fb66666d541050b.tar.gz | |
Merge tag 'drm-misc-fixes-2022-05-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Fix for a memory leak in dp_mst, a (userspace) build fix for
DMA_BUF_SET_NAME defines and a directory name generation fix for dmabuf
stats
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220520072408.cpjzy2taugagvrh7@houat
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/dma-buf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h index 8e4a2ca0bcbf70..b1523cb8ab307d 100644 --- a/include/uapi/linux/dma-buf.h +++ b/include/uapi/linux/dma-buf.h @@ -92,7 +92,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 |