Commit 522dbb35 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-intel-fixes-2017-10-25' of...

Merge tag 'drm-intel-fixes-2017-10-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

drm-intel-fixes-2017-10-25:

only 1 fix for stable:

- fix perf enable/disable ioctls for 32bits (lionel)

* tag 'drm-intel-fixes-2017-10-25' of git://anongit.freedesktop.org/drm/drm-intel:
  drm/i915/perf: fix perf enable/disable ioctls with 32bits userspace
parents 5a28747b 7277f755
...@@ -2537,6 +2537,10 @@ static const struct file_operations fops = { ...@@ -2537,6 +2537,10 @@ static const struct file_operations fops = {
.poll = i915_perf_poll, .poll = i915_perf_poll,
.read = i915_perf_read, .read = i915_perf_read,
.unlocked_ioctl = i915_perf_ioctl, .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,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment