summaryrefslogtreecommitdiffstats
path: root/include/uapi/drm/drm.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-03-30 17:12:33 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-03-30 21:07:45 +0200
commit4c4925fa0c2b5943655ef28b2d6a379961db551f (patch)
tree98bf2bb8420e0dd3e057af87c20bdb7721f0529e /include/uapi/drm/drm.h
parent44debe7a123cc760fc90ccbe253210798c917fa7 (diff)
downloadlinux-stable-4c4925fa0c2b5943655ef28b2d6a379961db551f.tar.gz
linux-stable-4c4925fa0c2b5943655ef28b2d6a379961db551f.tar.bz2
linux-stable-4c4925fa0c2b5943655ef28b2d6a379961db551f.zip
drm: Make drm.h uapi header safe for C++
virtual is a protected keyword in C++ and can't be used at all. Ugh. This aligns the kernel versions of the drm headers with the ones in libdrm. v2: Also annote with __user, as request by Emil&Ilia. Cc: Ilia Mirkin <imirkin@alum.mit.edu> Cc: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1459350753-18320-1-git-send-email-daniel.vetter@ffwll.ch
Diffstat (limited to 'include/uapi/drm/drm.h')
-rw-r--r--include/uapi/drm/drm.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
index a0ebfe7c9a28..7d42d105f32a 100644
--- a/include/uapi/drm/drm.h
+++ b/include/uapi/drm/drm.h
@@ -373,7 +373,11 @@ struct drm_buf_pub {
*/
struct drm_buf_map {
int count; /**< Length of the buffer list */
+#ifdef __cplusplus
+ void __user *virt;
+#else
void __user *virtual; /**< Mmap'd area in user-virtual */
+#endif
struct drm_buf_pub __user *list; /**< Buffer information */
};