Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/msm: Rename drm_msm_gem_submit_reloc::or in C++ code

Clashes with C++ `or` keyword

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/528751/
Link: https://lore.kernel.org/r/20230326163813.535762-1-robdclark@gmail.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

authored by

Danylo Piliaiev and committed by
Dmitry Baryshkov
f1af066b 45d96836

+4
+4
include/uapi/drm/msm_drm.h
··· 186 186 */ 187 187 struct drm_msm_gem_submit_reloc { 188 188 __u32 submit_offset; /* in, offset from submit_bo */ 189 + #ifdef __cplusplus 190 + __u32 _or; /* in, value OR'd with result */ 191 + #else 189 192 __u32 or; /* in, value OR'd with result */ 193 + #endif 190 194 __s32 shift; /* in, amount of left shift (can be negative) */ 191 195 __u32 reloc_idx; /* in, index of reloc_bo buffer */ 192 196 __u64 reloc_offset; /* in, offset from start of reloc_bo */