Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c4925fa authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459350753-18320-1-git-send-email-daniel.vetter@ffwll.ch
parent 44debe7a

include/uapi/drm/drm.h

+4 −0
Original line number Diff line number Diff line
@@ -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 */

};