PR14172: Fix the include order so vma tracking works

In commit 529c7eae, by moving the sym.c include, I broke the order
between #define HAVE_TASK_FINDER and the #ifdef in vma.c.

Reported-by: Yichun Zhang <agentzh@gmail.com>

diff --git a/runtime/linux/runtime.h b/runtime/linux/runtime.h
index 783f1992e6962209ff7fcf5c0edcd09257d3545a..e167be6e4d6d912efc2f9dd2af8a038dfebae20d 100644 (file)
--- a/runtime/linux/runtime.h
+++ b/runtime/linux/runtime.h
@@ -163,13 +163,13 @@ void *kallsyms_task_work_cancel;
 #include "copy.c"
 #include "regs.c"
 #include "regs-ia64.c"
-#include "sym.c"
 
 #if (defined(CONFIG_UTRACE) || defined(STAPCONF_UTRACE_VIA_TRACEPOINTS))
 #define HAVE_TASK_FINDER
 #include "task_finder.c"
 #endif
 
+#include "sym.c"
 #ifdef STP_PERFMON
 #include "perf.c"
 #endif

diff --git a/runtime/linux/task_finder.c b/runtime/linux/task_finder.c
index d718e80c69f458f5dd3d73d5c57a3e180f7cd0e2..e2e575a026fdb79500ada9f63151b595412d34ed 100644 (file)
--- a/runtime/linux/task_finder.c
+++ b/runtime/linux/task_finder.c
@@ -26,6 +26,7 @@
 #include "syscall.h"
 #include "utrace_compatibility.h"
 #include "task_finder_map.c"
+#include "task_finder_vma.c"
 
 static LIST_HEAD(__stp_task_finder_list);
 

diff --git a/runtime/linux/task_finder2.c b/runtime/linux/task_finder2.c
index 5cee195b335f86eda5483d43e39817b85a1c14a5..27ba2d22afd8356ee802d42abde4480820957339 100644 (file)
--- a/runtime/linux/task_finder2.c
+++ b/runtime/linux/task_finder2.c
@@ -11,6 +11,7 @@
 #endif
 #include "syscall.h"
 #include "task_finder_map.c"
+#include "task_finder_vma.c"
 
 static LIST_HEAD(__stp_task_finder_list);
 

diff --git a/runtime/task_finder_vma.c b/runtime/task_finder_vma.c
index 1c1bfbceec3ecc2548fb5b3f666b3d058684a4ca..fa212ac5abad2cace4160dd38e420ba92b5c267b 100644 (file)
--- a/runtime/task_finder_vma.c
+++ b/runtime/task_finder_vma.c
@@ -1,3 +1,6 @@
+#ifndef TASK_FINDER_VMA_C
+#define TASK_FINDER_VMA_C
+
 #include <linux/list.h>
 #include <linux/jhash.h>
 #include <linux/spinlock.h>
@@ -389,3 +392,5 @@ stap_find_exe_file(struct mm_struct* mm)
        return mm->exe_file;
 #endif
 }
+
+#endif /* TASK_FINDER_VMA_C */