clock: output clock description in metadata

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

diff --git a/wrapper/ftrace.h b/wrapper/ftrace.h
index da7c39478b5dbc951129e85b9cc25f4c47abda07..0f15ee4a31daca2942a28ea9d864ebf4255c98c5 100644 (file)
--- a/wrapper/ftrace.h
+++ b/wrapper/ftrace.h
@@ -1,5 +1,5 @@
-#ifndef _LTT_WRAPPER_FTRACE_H
-#define _LTT_WRAPPER_FTRACE_H
+#ifndef _LTTNG_WRAPPER_FTRACE_H
+#define _LTTNG_WRAPPER_FTRACE_H
 
 /*
  * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
@@ -16,6 +16,7 @@
 #ifdef CONFIG_KALLSYMS
 
 #include <linux/kallsyms.h>
+#include "kallsyms.h"
 
 static inline
 int wrapper_register_ftrace_function_probe(char *glob,
@@ -24,7 +25,7 @@ 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 {
@@ -40,7 +41,7 @@ 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 {
@@ -53,18 +54,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 */