Merge "drm/msm: make msm_drm.h uapi header safe for C++"

 */

struct drm_msm_gem_submit_reloc {

	__u32 submit_offset;  /* in, offset from submit_bo */

#ifdef __cplusplus

	__u32 or_val;

#else

	__u32 or; /* in, value OR'd with result */

#endif

	__s32  shift;          /* in, amount of left shift (can be negative) */

	__u32 reloc_idx;      /* in, index of reloc_bo buffer */

	__u64 reloc_offset;   /* in, offset from start of reloc_bo */