From 8baa7acd821ff0f2eb9cc0d21bf825c6718dbed7 Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Wed, 8 Mar 2023 13:45:41 +0100 Subject: [PATCH] freedreno/msm: Rename drm_msm_gem_submit_reloc::or in C++ code Clashes with C++ `or` keyword Signed-off-by: Danylo Piliaiev Part-of: --- include/drm-uapi/msm_drm.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/drm-uapi/msm_drm.h b/include/drm-uapi/msm_drm.h index 3c7b097c4e3..16f2eb4b65e 100644 --- a/include/drm-uapi/msm_drm.h +++ b/include/drm-uapi/msm_drm.h @@ -180,7 +180,11 @@ struct drm_msm_gem_cpu_fini { */ struct drm_msm_gem_submit_reloc { __u32 submit_offset; /* in, offset from submit_bo */ +#ifdef __cplusplus + __u32 _or; /* in, value OR'd with result */ +#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 */