From f6484fe286bb5f627f31d3416acf9e527dc68994 Mon Sep 17 00:00:00 2001 From: Manoj Kumar AVM Date: Tue, 9 May 2017 14:08:10 -0700 Subject: [PATCH] drm/msm: make msm_drm.h uapi header safe for C++ fixes the C++ related compilation issues. CRs-Fixed: 2038080 Change-Id: If6b4f379eb27f3de6153b8666f733c0b8245851f Signed-off-by: Manoj Kumar AVM --- include/uapi/drm/msm_drm.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 0b85ed6a3710..4d11c0473160 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -160,8 +160,12 @@ struct drm_msm_gem_cpu_fini { */ struct drm_msm_gem_submit_reloc { __u32 submit_offset; /* in, offset from submit_bo */ - __u32 or; /* in, value OR'd with result */ - __s32 shift; /* in, amount of left shift (can be negative) */ +#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 */ };