diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-28 12:28:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-28 12:28:00 +1000 |
| commit | a44ddbcbbd72ba8569df1ecbb4b1372506454dff (patch) | |
| tree | fba92dd66e9d670ed8e9d13825c90806898ad12c /drivers/dma-buf/dma-buf.c | |
| parent | 45554b2357d5782497e59f09146cc3636d6ad551 (diff) | |
| parent | 888022c0473d079bff9b47fb50434b1f20f8f37f (diff) | |
| download | talos-op-linux-a44ddbcbbd72ba8569df1ecbb4b1372506454dff.tar.gz talos-op-linux-a44ddbcbbd72ba8569df1ecbb4b1372506454dff.zip | |
Merge tag 'drm-misc-next-fixes-2017-02-27' of git://anongit.freedesktop.org/git/drm-misc into drm-next
Misc fixes for the 4.11 merge window.
- vmwgfx drm_control node compat patch
- rockchip&zte fix
- compat32 support for dma-buf ioctl (cc: stable ofc, since this is a
massive fumble. oops)
* tag 'drm-misc-next-fixes-2017-02-27' of git://anongit.freedesktop.org/git/drm-misc:
dma-buf: add support for compat ioctl
drm/vmwgfx: Work around drm removal of control nodes
drm/rockchip: cdn-dp: Fix error handling
drm/rockchip: add extcon dependency for DP
drm: zte: fix static checker warning on variable 'fmt'
Diffstat (limited to 'drivers/dma-buf/dma-buf.c')
| -rw-r--r-- | drivers/dma-buf/dma-buf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 718f832a5c71..0007b792827b 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -325,6 +325,9 @@ static const struct file_operations dma_buf_fops = { .llseek = dma_buf_llseek, .poll = dma_buf_poll, .unlocked_ioctl = dma_buf_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = dma_buf_ioctl, +#endif }; /* |
