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 7f4d8300c53eb591bd7e55b84529bd2ab634e288..8129833f8a896e27e4084b8530ad4710b4479fe9 100644 (file)
--- a/include/wrapper/kallsyms.h
+++ b/include/wrapper/kallsyms.h
@@ -14,23 +14,33 @@
 #define _LTTNG_WRAPPER_KALLSYMS_H
 
 #include <linux/kallsyms.h>
-#include <linux/version.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
+#endif
+#if defined(CONFIG_PPC64_ELF_ABI_V1) || (defined(CONFIG_PPC64) && defined(CONFIG_CPU_BIG_ENDIAN))
+#define LTTNG_CONFIG_PPC64_ELF_ABI_V1
+#endif
 
 /*
  * PowerPC ABIv1 needs KALLSYMS_ALL to get the function descriptor,
  * which is needed to perform the function call.
  */
-#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF < 2)
+#ifdef LTTNG_CONFIG_PPC64_ELF_ABI_V1
 # ifndef CONFIG_KALLSYMS_ALL
 #  error "LTTng-modules requires CONFIG_KALLSYMS_ALL on PowerPC ABIv1"
 # endif
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,7,0))
 
 unsigned long wrapper_kallsyms_lookup_name(const char *name);
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) */
+#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,7,0)) */
 
 static inline
 unsigned long wrapper_kallsyms_lookup_name(const char *name)
@@ -38,7 +48,7 @@ unsigned long wrapper_kallsyms_lookup_name(const char *name)
        return kallsyms_lookup_name(name);
 }
 
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) */
+#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,7,0)) */
 
 static inline
 unsigned long kallsyms_lookup_funcptr(const char *name)
@@ -46,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;
 }