diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2016-11-01 17:40:44 +0200 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2016-11-02 11:33:47 -0400 |
| commit | 55edf41b699bcb31dcf45082d99e91b7e217206e (patch) | |
| tree | ffebf8ce162670b22e2befa0a438cb0b740f385d /include/drm | |
| parent | 0a97c81a9717431e6c57ea845b59c3c345edce67 (diff) | |
| download | op-kernel-dev-55edf41b699bcb31dcf45082d99e91b7e217206e.zip op-kernel-dev-55edf41b699bcb31dcf45082d99e91b7e217206e.tar.gz | |
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
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index e336e39..a3effab 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -941,8 +941,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); /* File Operations (drm_fops.c) */ |
