Skip to content

Commit 522dbb3

Browse files
committed
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
2 parents 5a28747 + 7277f75 commit 522dbb3

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/gpu/drm/i915/i915_perf.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2537,6 +2537,10 @@ static const struct file_operations fops = {
25372537
.poll = i915_perf_poll,
25382538
.read = i915_perf_read,
25392539
.unlocked_ioctl = i915_perf_ioctl,
2540+
/* Our ioctl have no arguments, so it's safe to use the same function
2541+
* to handle 32bits compatibility.
2542+
*/
2543+
.compat_ioctl = i915_perf_ioctl,
25402544
};
25412545

25422546

0 commit comments

Comments
 (0)