diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-03-30 17:12:33 +0200 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-03 12:55:29 -0700 |
| commit | c136471fc895ae3f0704d596ca39b3d5702a7989 (patch) | |
| tree | e9bbf3315674fa76ef2872033557f67798c6d774 /include | |
| parent | d637621d70f05a4971692fbf37a6d4970756dc58 (diff) | |
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.
Change-Id: I7e03ac0b39d6266ff865c00feb97bec6bc5d753b
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>
Patch-mainline: dri-devel @ 30 Mar 2016 15:12
Signed-off-by: Yajun Li <yajunl@codeaurora.org>
Signed-off-by: Jin Li <jinl@codeaurora.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/drm/drm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 3801584a0c53..68927d7601b6 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -372,7 +372,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 */ }; |