Fix: update ftrace probe for kernel 4.12

[lttng-modules.git] / wrapper / ftrace.h

diff --git a/wrapper/ftrace.h b/wrapper/ftrace.h
index 064f9c7cab1dc5aed9a7045cef562bdfcbc4043d..de618734e44ee4cf4e6f587291dad59f37825a07 100644 (file)
--- a/wrapper/ftrace.h
+++ b/wrapper/ftrace.h
@@ -26,11 +26,15 @@
  */
 
 #include <linux/ftrace.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0))
+#include <../kernel/trace/trace.h>
+#endif
 
 #ifdef CONFIG_KALLSYMS
 
 #include <linux/kallsyms.h>
-#include "kallsyms.h"
+#include <wrapper/kallsyms.h>
 
 static inline
 int wrapper_register_ftrace_function_probe(char *glob,
@@ -43,7 +47,7 @@ int wrapper_register_ftrace_function_probe(char *glob,
        if (register_ftrace_function_probe_sym) {
                return register_ftrace_function_probe_sym(glob, ops, data);
        } else {
-               printk(KERN_WARNING "LTTng: register_ftrace_function_probe symbol lookup failed.\n");
+               printk_once(KERN_WARNING "LTTng: register_ftrace_function_probe symbol lookup failed.\n");
                return -EINVAL;
        }
 }
@@ -59,7 +63,7 @@ void wrapper_unregister_ftrace_function_probe(char *glob,
        if (unregister_ftrace_function_probe_sym) {
                unregister_ftrace_function_probe_sym(glob, ops, data);
        } else {
-               printk(KERN_WARNING "LTTng: unregister_ftrace_function_probe symbol lookup failed.\n");
+               printk_once(KERN_WARNING "LTTng: unregister_ftrace_function_probe symbol lookup failed.\n");
                WARN_ON(1);
        }
 }