From 242f90b45e895bb0721721f486e2497054eeb0c1 Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Sun, 26 Mar 2023 09:38:13 -0700 Subject: [PATCH] UPSTREAM: drm/msm: Rename drm_msm_gem_submit_reloc::or in C++ code Clashes with C++ `or` keyword Signed-off-by: Danylo Piliaiev Signed-off-by: Rob Clark Reviewed-by: Dmitry Baryshkov Patchwork: https://patchwork.freedesktop.org/patch/528751/ Link: https://lore.kernel.org/r/20230326163813.535762-1-robdclark@gmail.com Signed-off-by: Dmitry Baryshkov Bug: 409896277 Change-Id: Ib8894a7facce6e4f80d586575b3cffaf53a22a1e (cherry picked from commit f1af066bcfd38daa9eee7195ef772dadaaa18520) Signed-off-by: Mahadevan --- include/uapi/drm/msm_drm.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 3c7b097c4e3d..16f2eb4b65ee 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/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 */