Attachment 728077 Details for Bug 1043231

[patch] 0019-drm-define-drm_compat_ioctl-NULL-on-CONFIG_COMPAT-n-.patch

0019-drm-define-drm_compat_ioctl-NULL-on-CONFIG_COMPAT-n-.patch (text/plain), 17.37 KB, created by Matwey Kornilov on 2017-06-07 19:38:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matwey Kornilov

Created: 2017-06-07 19:38:19 UTC

Size: 17.37 KB

patch

obsolete

>From 0107e5aea5ba99a1634bd873abdc313ab19392eb Mon Sep 17 00:00:00 2001
>From: Jani Nikula <jani.nikula@intel.com>
>Date: Tue, 1 Nov 2016 17:40:44 +0200
>Subject: [PATCH 19/19] drm: define drm_compat_ioctl NULL on CONFIG_COMPAT=n
> and reduce #ifdefs
>
>If we define drm_compat_ioctl NULL on CONFIG_COMPAT=n, we don't have to
>check for the config everywhere.
>
>Reviewed-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>Signed-off-by: Sean Paul <seanpaul@chromium.org>
>Link: http://patchwork.freedesktop.org/patch/msgid/1478014844-27454-1-git-send-email-jani.nikula@intel.com
>Git-commit: 55edf41b699bcb31dcf45082d99e91b7e217206e
>Patch-mainline: v4.10-rc1
>Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
>---
> drivers/gpu/drm/ast/ast_drv.c                |  2 --
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c |  2 --
> drivers/gpu/drm/bochs/bochs_drv.c            |  2 --
> drivers/gpu/drm/cirrus/cirrus_drv.c          |  2 --
> drivers/gpu/drm/drm_fops.c                   | 39 ++++++++++++++++++++++++++++
> drivers/gpu/drm/exynos/exynos_drm_drv.c      |  2 --
> drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c    |  2 --
> drivers/gpu/drm/gma500/psb_drv.c             |  2 --
> drivers/gpu/drm/i810/i810_dma.c              |  2 --
> drivers/gpu/drm/i810/i810_drv.c              |  2 --
> drivers/gpu/drm/i915/i915_drv.c              |  2 --
> drivers/gpu/drm/i915/i915_drv.h              |  2 ++
> drivers/gpu/drm/mgag200/mgag200_drv.c        |  2 --
> drivers/gpu/drm/msm/msm_drv.c                |  2 --
> drivers/gpu/drm/rcar-du/rcar_du_drv.c        |  2 --
> drivers/gpu/drm/rockchip/rockchip_drm_drv.c  |  2 --
> drivers/gpu/drm/savage/savage_drv.c          |  2 --
> drivers/gpu/drm/shmobile/shmob_drm_drv.c     |  2 --
> drivers/gpu/drm/sis/sis_drv.c                |  2 --
> drivers/gpu/drm/sti/sti_drv.c                |  2 --
> drivers/gpu/drm/tdfx/tdfx_drv.c              |  2 --
> drivers/gpu/drm/tegra/drm.c                  |  2 --
> drivers/gpu/drm/tilcdc/tilcdc_drv.c          |  2 --
> drivers/gpu/drm/udl/udl_drv.c                |  2 --
> drivers/gpu/drm/vc4/vc4_drv.c                |  2 --
> drivers/gpu/drm/via/via_drv.c                |  2 --
> drivers/gpu/drm/virtio/virtgpu_drv.c         |  2 --
> include/drm/drmP.h                           |  5 ++++
> 28 files changed, 46 insertions(+), 50 deletions(-)
>
>diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
>index fcd9c0714836..665e32f1ef1a 100644
>--- a/drivers/gpu/drm/ast/ast_drv.c
>+++ b/drivers/gpu/drm/ast/ast_drv.c
>@@ -188,9 +188,7 @@ static const struct file_operations ast_fops = {
> 	.unlocked_ioctl = drm_ioctl,
> 	.mmap = ast_mmap,
> 	.poll = drm_poll,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.read = drm_read,
> };
> 
>diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
>index 244df0a440b7..b366080be7d7 100644
>--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
>+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
>@@ -680,9 +680,7 @@ static const struct file_operations fops = {
> 	.open               = drm_open,
> 	.release            = drm_release,
> 	.unlocked_ioctl     = drm_ioctl,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl       = drm_compat_ioctl,
>-#endif
> 	.poll               = drm_poll,
> 	.read               = drm_read,
> 	.llseek             = no_llseek,
>diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
>index 7f1a3604b19f..f1d4cede892b 100644
>--- a/drivers/gpu/drm/bochs/bochs_drv.c
>+++ b/drivers/gpu/drm/bochs/bochs_drv.c
>@@ -69,9 +69,7 @@ static const struct file_operations bochs_fops = {
> 	.open		= drm_open,
> 	.release	= drm_release,
> 	.unlocked_ioctl	= drm_ioctl,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl	= drm_compat_ioctl,
>-#endif
> 	.poll		= drm_poll,
> 	.read		= drm_read,
> 	.llseek		= no_llseek,
>diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c
>index b394e6d8f01e..a9fd2cb36963 100644
>--- a/drivers/gpu/drm/cirrus/cirrus_drv.c
>+++ b/drivers/gpu/drm/cirrus/cirrus_drv.c
>@@ -125,9 +125,7 @@ static const struct file_operations cirrus_driver_fops = {
> 	.unlocked_ioctl = drm_ioctl,
> 	.mmap = cirrus_mmap,
> 	.poll = drm_poll,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> };
> static struct drm_driver driver = {
> 	.driver_features = DRIVER_MODESET | DRIVER_GEM,
>diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
>index 1ea8790e5090..7a0d8ce92101 100644
>--- a/drivers/gpu/drm/drm_fops.c
>+++ b/drivers/gpu/drm/drm_fops.c
>@@ -44,6 +44,45 @@
> /* from BKL pushdown */
> DEFINE_MUTEX(drm_global_mutex);
> 
>+/**
>+ * DOC: file operations
>+ *
>+ * Drivers must define the file operations structure that forms the DRM
>+ * userspace API entry point, even though most of those operations are
>+ * implemented in the DRM core. The mandatory functions are drm_open(),
>+ * drm_read(), drm_ioctl() and drm_compat_ioctl() if CONFIG_COMPAT is enabled
>+ * (note that drm_compat_ioctl will be NULL if CONFIG_COMPAT=n). Drivers which
>+ * implement private ioctls that require 32/64 bit compatibility support must
>+ * provide their own .compat_ioctl() handler that processes private ioctls and
>+ * calls drm_compat_ioctl() for core ioctls.
>+ *
>+ * In addition drm_read() and drm_poll() provide support for DRM events. DRM
>+ * events are a generic and extensible means to send asynchronous events to
>+ * userspace through the file descriptor. They are used to send vblank event and
>+ * page flip completions by the KMS API. But drivers can also use it for their
>+ * own needs, e.g. to signal completion of rendering.
>+ *
>+ * The memory mapping implementation will vary depending on how the driver
>+ * manages memory. Legacy drivers will use the deprecated drm_legacy_mmap()
>+ * function, modern drivers should use one of the provided memory-manager
>+ * specific implementations. For GEM-based drivers this is drm_gem_mmap().
>+ *
>+ * No other file operations are supported by the DRM userspace API. Overall the
>+ * following is an example #file_operations structure::
>+ *
>+ *     static const example_drm_fops = {
>+ *             .owner = THIS_MODULE,
>+ *             .open = drm_open,
>+ *             .release = drm_release,
>+ *             .unlocked_ioctl = drm_ioctl,
>+ *             .compat_ioctl = drm_compat_ioctl, // NULL if CONFIG_COMPAT=n
>+ *             .poll = drm_poll,
>+ *             .read = drm_read,
>+ *             .llseek = no_llseek,
>+ *             .mmap = drm_gem_mmap,
>+ *     };
>+ */
>+
> static int drm_open_helper(struct file *filp, struct drm_minor *minor);
> 
> static int drm_setup(struct drm_device * dev)
>diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
>index 2c6019d6a205..1eb1afca3a78 100644
>--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
>+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
>@@ -433,9 +433,7 @@ static const struct file_operations exynos_drm_driver_fops = {
> 	.poll		= drm_poll,
> 	.read		= drm_read,
> 	.unlocked_ioctl	= drm_ioctl,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.release	= drm_release,
> };
> 
>diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
>index 1930234ba5f1..d90da19e5f79 100644
>--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
>+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
>@@ -177,9 +177,7 @@ static const struct file_operations fsl_dcu_drm_fops = {
> 	.open		= drm_open,
> 	.release	= drm_release,
> 	.unlocked_ioctl	= drm_ioctl,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl	= drm_compat_ioctl,
>-#endif
> 	.poll		= drm_poll,
> 	.read		= drm_read,
> 	.llseek		= no_llseek,
>diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
>index db98ab5cde3d..5cd0b56cb028 100644
>--- a/drivers/gpu/drm/gma500/psb_drv.c
>+++ b/drivers/gpu/drm/gma500/psb_drv.c
>@@ -484,9 +484,7 @@ static const struct file_operations psb_gem_fops = {
> 	.open = drm_open,
> 	.release = drm_release,
> 	.unlocked_ioctl = psb_unlocked_ioctl,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.mmap = drm_gem_mmap,
> 	.poll = drm_poll,
> 	.read = drm_read,
>diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
>index d91856779beb..ab4e6cbe1f8b 100644
>--- a/drivers/gpu/drm/i810/i810_dma.c
>+++ b/drivers/gpu/drm/i810/i810_dma.c
>@@ -113,9 +113,7 @@ static const struct file_operations i810_buffer_fops = {
> 	.release = drm_release,
> 	.unlocked_ioctl = drm_ioctl,
> 	.mmap = i810_mmap_buffers,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.llseek = noop_llseek,
> };
> 
>diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
>index 44f4a131c8dd..3c4a49747376 100644
>--- a/drivers/gpu/drm/i810/i810_drv.c
>+++ b/drivers/gpu/drm/i810/i810_drv.c
>@@ -49,9 +49,7 @@ static const struct file_operations i810_driver_fops = {
> 	.unlocked_ioctl = drm_ioctl,
> 	.mmap = drm_legacy_mmap,
> 	.poll = drm_poll,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.llseek = noop_llseek,
> };
> 
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index 0f426c2b0763..03c4bac043ba 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -1766,9 +1766,7 @@ static const struct file_operations i915_driver_fops = {
> 	.mmap = drm_gem_mmap,
> 	.poll = drm_poll,
> 	.read = drm_read,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = i915_compat_ioctl,
>-#endif
> 	.llseek = noop_llseek,
> };
> 
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 4e266197fd4b..93e5ecb46242 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -2721,6 +2721,8 @@ extern void i915_driver_postclose(struct drm_device *dev,
> #ifdef CONFIG_COMPAT
> extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
> 			      unsigned long arg);
>+#else
>+#define i915_compat_ioctl NULL
> #endif
> extern int intel_gpu_reset(struct drm_device *dev);
> extern bool intel_has_gpu_reset(struct drm_device *dev);
>diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
>index 44ec86e25d34..d656f1b983bc 100644
>--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
>+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
>@@ -126,9 +126,7 @@ static const struct file_operations mgag200_driver_fops = {
> 	.unlocked_ioctl = drm_ioctl,
> 	.mmap = mgag200_mmap,
> 	.poll = drm_poll,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.read = drm_read,
> };
> 
>diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
>index b88ce514eb8e..d10cc9d1c5db 100644
>--- a/drivers/gpu/drm/msm/msm_drv.c
>+++ b/drivers/gpu/drm/msm/msm_drv.c
>@@ -948,9 +948,7 @@ static const struct file_operations fops = {
> 	.open               = drm_open,
> 	.release            = drm_release,
> 	.unlocked_ioctl     = drm_ioctl,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl       = drm_compat_ioctl,
>-#endif
> 	.poll               = drm_poll,
> 	.read               = drm_read,
> 	.llseek             = no_llseek,
>diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
>index 40422f6b645e..c8e583b56379 100644
>--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
>+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
>@@ -257,9 +257,7 @@ static const struct file_operations rcar_du_fops = {
> 	.open		= drm_open,
> 	.release	= drm_release,
> 	.unlocked_ioctl	= drm_ioctl,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl	= drm_compat_ioctl,
>-#endif
> 	.poll		= drm_poll,
> 	.read		= drm_read,
> 	.llseek		= no_llseek,
>diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
>index 90155b3a5fd1..b376e92fdee6 100644
>--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
>+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
>@@ -263,9 +263,7 @@ static const struct file_operations rockchip_drm_driver_fops = {
> 	.poll = drm_poll,
> 	.read = drm_read,
> 	.unlocked_ioctl = drm_ioctl,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.release = drm_release,
> };
> 
>diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c
>index 21aed1febeb4..a1686d35a74f 100644
>--- a/drivers/gpu/drm/savage/savage_drv.c
>+++ b/drivers/gpu/drm/savage/savage_drv.c
>@@ -42,9 +42,7 @@ static const struct file_operations savage_driver_fops = {
> 	.unlocked_ioctl = drm_ioctl,
> 	.mmap = drm_legacy_mmap,
> 	.poll = drm_poll,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.llseek = noop_llseek,
> };
> 
>diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
>index 04e66e3751b4..440c590fc42d 100644
>--- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c
>+++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
>@@ -252,9 +252,7 @@ static const struct file_operations shmob_drm_fops = {
> 	.open		= drm_open,
> 	.release	= drm_release,
> 	.unlocked_ioctl	= drm_ioctl,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl	= drm_compat_ioctl,
>-#endif
> 	.poll		= drm_poll,
> 	.read		= drm_read,
> 	.llseek		= no_llseek,
>diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
>index 79bce76cb8f7..4ce48c2b199f 100644
>--- a/drivers/gpu/drm/sis/sis_drv.c
>+++ b/drivers/gpu/drm/sis/sis_drv.c
>@@ -72,9 +72,7 @@ static const struct file_operations sis_driver_fops = {
> 	.unlocked_ioctl = drm_ioctl,
> 	.mmap = drm_legacy_mmap,
> 	.poll = drm_poll,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.llseek = noop_llseek,
> };
> 
>diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
>index 1469987949d8..cd1847829ff6 100644
>--- a/drivers/gpu/drm/sti/sti_drv.c
>+++ b/drivers/gpu/drm/sti/sti_drv.c
>@@ -174,9 +174,7 @@ static const struct file_operations sti_driver_fops = {
> 	.poll = drm_poll,
> 	.read = drm_read,
> 	.unlocked_ioctl = drm_ioctl,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.release = drm_release,
> };
> 
>diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c
>index fab5ebcb0fef..fe5682bc5e4a 100644
>--- a/drivers/gpu/drm/tdfx/tdfx_drv.c
>+++ b/drivers/gpu/drm/tdfx/tdfx_drv.c
>@@ -49,9 +49,7 @@ static const struct file_operations tdfx_driver_fops = {
> 	.unlocked_ioctl = drm_ioctl,
> 	.mmap = drm_legacy_mmap,
> 	.poll = drm_poll,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.llseek = noop_llseek,
> };
> 
>diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
>index 159ef515cab1..ab6bea2d189e 100644
>--- a/drivers/gpu/drm/tegra/drm.c
>+++ b/drivers/gpu/drm/tegra/drm.c
>@@ -803,9 +803,7 @@ static const struct file_operations tegra_drm_fops = {
> 	.mmap = tegra_drm_mmap,
> 	.poll = drm_poll,
> 	.read = drm_read,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.llseek = noop_llseek,
> };
> 
>diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
>index 876cad58b1f9..3186555eb048 100644
>--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
>+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
>@@ -543,9 +543,7 @@ static const struct file_operations fops = {
> 	.open               = drm_open,
> 	.release            = drm_release,
> 	.unlocked_ioctl     = drm_ioctl,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl       = drm_compat_ioctl,
>-#endif
> 	.poll               = drm_poll,
> 	.read               = drm_read,
> 	.llseek             = no_llseek,
>diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
>index d5728ec85254..844818037908 100644
>--- a/drivers/gpu/drm/udl/udl_drv.c
>+++ b/drivers/gpu/drm/udl/udl_drv.c
>@@ -30,9 +30,7 @@ static const struct file_operations udl_driver_fops = {
> 	.read = drm_read,
> 	.unlocked_ioctl	= drm_ioctl,
> 	.release = drm_release,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.llseek = noop_llseek,
> };
> 
>diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
>index 8f7ee01a28d5..b3c51ce6f579 100644
>--- a/drivers/gpu/drm/vc4/vc4_drv.c
>+++ b/drivers/gpu/drm/vc4/vc4_drv.c
>@@ -59,9 +59,7 @@ static const struct file_operations vc4_drm_fops = {
> 	.mmap = vc4_mmap,
> 	.poll = drm_poll,
> 	.read = drm_read,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.llseek = noop_llseek,
> };
> 
>diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
>index ed8aa8ff861a..b94f9a61f547 100644
>--- a/drivers/gpu/drm/via/via_drv.c
>+++ b/drivers/gpu/drm/via/via_drv.c
>@@ -64,9 +64,7 @@ static const struct file_operations via_driver_fops = {
> 	.unlocked_ioctl = drm_ioctl,
> 	.mmap = drm_legacy_mmap,
> 	.poll = drm_poll,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.llseek = noop_llseek,
> };
> 
>diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
>index a2f92a718f9b..00ef8dfc9d84 100644
>--- a/drivers/gpu/drm/virtio/virtgpu_drv.c
>+++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
>@@ -108,9 +108,7 @@ static const struct file_operations virtio_gpu_driver_fops = {
> 	.read = drm_read,
> 	.unlocked_ioctl	= drm_ioctl,
> 	.release = drm_release,
>-#ifdef CONFIG_COMPAT
> 	.compat_ioctl = drm_compat_ioctl,
>-#endif
> 	.llseek = noop_llseek,
> };
> 
>diff --git a/include/drm/drmP.h b/include/drm/drmP.h
>index 243dcbff965b..2ed154322d79 100644
>--- a/include/drm/drmP.h
>+++ b/include/drm/drmP.h
>@@ -915,8 +915,13 @@ static inline bool drm_is_primary_client(const struct drm_file *file_priv)
> extern int drm_ioctl_permit(u32 flags, struct drm_file *file_priv);
> extern long drm_ioctl(struct file *filp,
> 		      unsigned int cmd, unsigned long arg);
>+#ifdef CONFIG_COMPAT
> extern long drm_compat_ioctl(struct file *filp,
> 			     unsigned int cmd, unsigned long arg);
>+#else
>+/* Let drm_compat_ioctl be assigned to .compat_ioctl unconditionally */
>+#define drm_compat_ioctl NULL
>+#endif
> extern bool drm_ioctl_flags(unsigned int nr, unsigned int *flags);
> 
> 				/* Device support (drm_fops.h) */
>-- 
>2.12.0
>

Actions: View | Diff

Attachments on bug 1043231: 728059 | 728060 | 728061 | 728062 | 728063 | 728064 | 728065 | 728066 | 728067 | 728068 | 728069 | 728070 | 728071 | 728072 | 728073 | 728074 | 728075 | 728076 | 728077 | 728521 | 728695 | 728770