kINT: Fix build without CONFIG_TRACEPOINTS

Fixes #334, ee41d81
lkrg-org · May 22, 2024 · d327c18 · d327c18
1 parent dbd39cc
commit d327c18
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,8 @@
+The following major changes have been made since 0.9.8:
+
+ *) Re-support build without CONFIG_TRACEPOINTS (was broken in 0.9.8)
+
+
 The following major changes have been made between LKRG 0.9.7 and 0.9.8:
 
  *) Add optional remote kernel message logging, including the sending component

diff --git a/src/modules/database/p_database.c b/src/modules/database/p_database.c
@@ -191,7 +191,9 @@ int p_create_database(void) {
 
  P_SYM_INIT(jump_label_mutex)
  P_SYM_INIT(text_mutex)
+#ifdef CONFIG_TRACEPOINTS
  P_SYM_INIT(tracepoints_mutex)
+#endif
 
  /*
  * First gather information about CPUs in the system - CRITICAL !!!

diff --git a/src/modules/database/p_database.h b/src/modules/database/p_database.h
@@ -205,7 +205,9 @@ static inline void p_text_section_lock(void) {
  mutex_lock(P_SYM(p_module_mutex));
  while (mutex_is_locked(P_SYM(p_jump_label_mutex)))
  schedule();
+#ifdef CONFIG_TRACEPOINTS
  mutex_lock(P_SYM(p_tracepoints_mutex));
+#endif
 #if defined(P_LKRG_CI_ARCH_STATIC_CALL_TRANSFORM_H)
  do {
  p_lkrg_counter_lock_lock(&p_static_call_spinlock, &p_text_flags);
@@ -226,7 +228,9 @@ static inline void p_text_section_unlock(void) {
 #if defined(P_LKRG_CI_ARCH_STATIC_CALL_TRANSFORM_H)
  p_lkrg_counter_lock_val_dec(&p_static_call_spinlock);
 #endif
+#ifdef CONFIG_TRACEPOINTS
  mutex_unlock(P_SYM(p_tracepoints_mutex));
+#endif
  /* Release the 'module_mutex' */
  mutex_unlock(P_SYM(p_module_mutex));
 #if defined(CONFIG_DYNAMIC_FTRACE)

diff --git a/src/p_lkrg_main.h b/src/p_lkrg_main.h
@@ -237,7 +237,9 @@ typedef struct _p_lkrg_global_symbols_structure {
  pmd_t *(*p_mm_find_pmd)(struct mm_struct *mm, unsigned long address);
  struct mutex *p_jump_label_mutex;
  struct mutex *p_text_mutex;
+#ifdef CONFIG_TRACEPOINTS
  struct mutex *p_tracepoints_mutex;
+#endif
  struct text_poke_loc **p_tp_vec;
  int *p_tp_vec_nr;
 #if defined(CONFIG_DYNAMIC_DEBUG)