X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fftrace.h;h=eb4f788a50959249f979bf86da5cb643660c6c1e;hb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;hp=da7c39478b5dbc951129e85b9cc25f4c47abda07;hpb=1c726b25f42c14020fbafdaa5cbb2c3eb1644b53;p=lttng-modules.git

diff --git a/wrapper/ftrace.h b/wrapper/ftrace.h
index da7c3947..eb4f788a 100644
--- a/wrapper/ftrace.h
+++ b/wrapper/ftrace.h
@@ -1,21 +1,27 @@
-#ifndef _LTT_WRAPPER_FTRACE_H
-#define _LTT_WRAPPER_FTRACE_H
-
-/*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
+ * wrapper/ftrace.h
  *
  * wrapper around vmalloc_sync_all. Using KALLSYMS to get its address when
  * available, else we need to have a kernel that exports this function to GPL
  * modules.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
+#ifndef _LTTNG_WRAPPER_FTRACE_H
+#define _LTTNG_WRAPPER_FTRACE_H
+
 #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 <wrapper/kallsyms.h>
 
 static inline
 int wrapper_register_ftrace_function_probe(char *glob,
@@ -24,11 +30,11 @@ int wrapper_register_ftrace_function_probe(char *glob,
 	int (*register_ftrace_function_probe_sym)(char *glob,
 			struct ftrace_probe_ops *ops, void *data);
 
-	register_ftrace_function_probe_sym = (void *) kallsyms_lookup_name("register_ftrace_function_probe");
+	register_ftrace_function_probe_sym = (void *) kallsyms_lookup_funcptr("register_ftrace_function_probe");
 	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;
 	}
 }
@@ -40,11 +46,11 @@ void wrapper_unregister_ftrace_function_probe(char *glob,
 	void (*unregister_ftrace_function_probe_sym)(char *glob,
 			struct ftrace_probe_ops *ops, void *data);
 
-	unregister_ftrace_function_probe_sym = (void *) kallsyms_lookup_name("unregister_ftrace_function_probe");
+	unregister_ftrace_function_probe_sym = (void *) kallsyms_lookup_funcptr("unregister_ftrace_function_probe");
 	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);
 	}
 }
@@ -53,18 +59,17 @@ void wrapper_unregister_ftrace_function_probe(char *glob,
 
 static inline
 int wrapper_register_ftrace_function_probe(char *glob,
-		struct ftrace_probe_ops *ops, void *data);
-
+		struct ftrace_probe_ops *ops, void *data)
 {
-	return unregister_ftrace_function_probe();
+	return register_ftrace_function_probe(glob, ops, data);
 }
 
 static inline
 void wrapper_unregister_ftrace_function_probe(char *glob,
-		struct ftrace_probe_ops *ops, void *data);
+		struct ftrace_probe_ops *ops, void *data)
 {
-	return unregister_ftrace_function_probe();
+	return unregister_ftrace_function_probe(glob, ops, data);
 }
 #endif
 
-#endif /* _LTT_WRAPPER_FTRACE_H */
+#endif /* _LTTNG_WRAPPER_FTRACE_H */