diff options
| author | Dave Airlie | 2017-11-02 03:40:41 +0100 |
|---|---|---|
| committer | Dave Airlie | 2017-11-02 03:40:41 +0100 |
| commit | 7a88cbd8d65d622c00bd76ba4ae1d893b292c91c (patch) | |
| tree | 826df7ac42ca13c33828d0142046186b91df686b /drivers/gpu/drm/i915/i915_perf.c | |
| parent | Merge tag 'drm-hisilicon-next-2017-11-01' of github.com:xin3liang/linux into ... (diff) | |
| parent | Linux 4.14-rc7 (diff) | |
| download | kernel-qcow2-linux-7a88cbd8d65d622c00bd76ba4ae1d893b292c91c.tar.gz kernel-qcow2-linux-7a88cbd8d65d622c00bd76ba4ae1d893b292c91c.tar.xz kernel-qcow2-linux-7a88cbd8d65d622c00bd76ba4ae1d893b292c91c.zip | |
Backmerge tag 'v4.14-rc7' into drm-next
Linux 4.14-rc7
Requested by Ben Skeggs for nouveau to avoid major conflicts,
and things were getting a bit conflicty already, esp around amdgpu
reverts.
Diffstat (limited to 'drivers/gpu/drm/i915/i915_perf.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_perf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index 1383a2995a69..59ee808f8fd9 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -2537,6 +2537,10 @@ static const struct file_operations fops = { .poll = i915_perf_poll, .read = i915_perf_read, .unlocked_ioctl = i915_perf_ioctl, + /* Our ioctl have no arguments, so it's safe to use the same function + * to handle 32bits compatibility. + */ + .compat_ioctl = i915_perf_ioctl, }; |