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

Commit bacaebb7 authored by Daniel Vetter's avatar Daniel Vetter Committed by Manoj Kumar AVM
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.

CRs-Fixed: 2038080
Change-Id: I184b99e51fc5c6efd4eb6f5ed9da2858b7972a6e
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
Git-commit: 4c4925fa0c2b5943655ef28b2d6a379961db551f
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4c4925f


Signed-off-by: default avatarManoj Kumar AVM <manojavm@codeaurora.org>
parent 3d82d664

include/uapi/drm/drm.h

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

};