diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-13 16:25:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-13 16:25:54 -0700 |
| commit | c6d1c1699e7dcc7ec170baae48be94814061d0b7 (patch) | |
| tree | 02a4f9d1e515f8758c5933acad1c12d5766db82c | |
| parent | ae4d972f07f97de9a368a33820a7fe38284498c2 (diff) | |
| parent | 01097dd1d0921296c0c5a79ae52d0f45f2f92208 (diff) | |
Merge "drm/msm: make msm_drm.h uapi header safe for C++"
| -rw-r--r-- | include/uapi/drm/msm_drm.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 5bd9321c717a..48c49741d77f 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -145,7 +145,11 @@ 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 */ +#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 */ |