Commit ea702393 authored by Tejun Heo's avatar Tejun Heo
Browse files

tools/sched_ext: Remove redundant SCX_ENQ_IMMED compat definition 

compat.bpf.h defined a fallback SCX_ENQ_IMMED macro using
__COMPAT_ENUM_OR_ZERO(). After 6bf36c68 ("tools/sched_ext:
Regenerate autogen enum headers") added SCX_ENQ_IMMED to the autogen
headers, including both triggers -Wmacro-redefined warnings.

The autogen definition through const volatile __weak already resolves to
0 on older kernels, providing the same backward compatibility. Remove
the now-redundant compat fallback.

Fixes: 6bf36c68 ("tools/sched_ext: Regenerate autogen enum headers")
Link: https://lore.kernel.org/r/20260326100313.338388-1-zhaomzhao@126.com


Reported-by: default avatarZhao Mengmeng <zhaomengmeng@kylinos.cn>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent f546c770

tools/sched_ext/include/scx/compat.bpf.h

+0 −5
Original line number Diff line number Diff line
@@ -422,11 +422,6 @@ static inline void scx_bpf_dsq_reenq(u64 dsq_id, u64 reenq_flags) 
		scx_bpf_error("kernel too old to reenqueue foreign local or user DSQs");

}



/*

 * v7.1: %SCX_ENQ_IMMED.

 */

#define SCX_ENQ_IMMED	__COMPAT_ENUM_OR_ZERO(enum scx_enq_flags, SCX_ENQ_IMMED)



/*

 * Define sched_ext_ops. This may be expanded to define multiple variants for

 * backward compatibility. See compat.h::SCX_OPS_LOAD/ATTACH().