From: Gregory Greenman <gregory.greenman@xxxxxxxxx> In later kernels, __CFI_ADDRESSABLE became just ___ADDRESSABLE, but we still use __CFI_ADDRESSABLE. Since it's easier this way, keep using __CFI_ADDRESSABLE but make it ___ADDRESSABLE if that exists. This fixes the issue that we get warnings about missing endbr: traps: Missing ENDBR: __exit_compat+0x0/0x20 [module name] Signed-off-by: Gregory Greenman <gregory.greenman@xxxxxxxxx> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> --- backport/backport-include/linux/module.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backport/backport-include/linux/module.h b/backport/backport-include/linux/module.h index b93a56d97611..8269238c2cd4 100644 --- a/backport/backport-include/linux/module.h +++ b/backport/backport-include/linux/module.h @@ -3,8 +3,11 @@ #include_next <linux/module.h> #include <linux/rcupdate.h> +#ifndef ___ADDRESSABLE +#define ___ADDRESSABLE(fn, __attr) +#endif #ifndef __CFI_ADDRESSABLE -#define __CFI_ADDRESSABLE(fn, __attr) +#define __CFI_ADDRESSABLE(fn, __attr) ___ADDRESSABLE(fn, __attr) #endif /* -- 2.45.1
