Compile fixes for RHEL 9.3 kernels

[lttng-modules.git] / include / wrapper / kallsyms.h

diff --git a/include/wrapper/kallsyms.h b/include/wrapper/kallsyms.h
index 0aac5a2d64ca28c19bc9abf2778413c4b04d370f..8129833f8a896e27e4084b8530ad4710b4479fe9 100644 (file)
--- a/include/wrapper/kallsyms.h
+++ b/include/wrapper/kallsyms.h
@@ -16,6 +16,8 @@
 #include <linux/kallsyms.h>
 #include <lttng/kernel-version.h>
 
+#include <wrapper/ibt.h>
+
 /* CONFIG_PPC64_ELF_ABI_V1/V2 were introduced in v5.19 */
 #if defined(CONFIG_PPC64_ELF_ABI_V2) || (defined(CONFIG_PPC64) && defined(CONFIG_CPU_LITTLE_ENDIAN))
 #define LTTNG_CONFIG_PPC64_ELF_ABI_V2
@@ -54,11 +56,9 @@ unsigned long kallsyms_lookup_funcptr(const char *name)
        unsigned long addr;
 
        addr = wrapper_kallsyms_lookup_name(name);
-#ifdef CONFIG_ARM
-#ifdef CONFIG_THUMB2_KERNEL
+#if defined(CONFIG_ARM) && defined(CONFIG_THUMB2_KERNEL)
        if (addr)
                addr |= 1; /* set bit 0 in address for thumb mode */
-#endif
 #endif
        return addr;
 }