License cleanup, ifdef namespace cleanup

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

diff --git a/wrapper/ftrace.h b/wrapper/ftrace.h
index da7c39478b5dbc951129e85b9cc25f4c47abda07..064f9c7cab1dc5aed9a7045cef562bdfcbc4043d 100644 (file)
--- a/wrapper/ftrace.h
+++ b/wrapper/ftrace.h
@@ -1,14 +1,28 @@
-#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)
+ * 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>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/ftrace.h>
@@ -16,6 +30,7 @@
 #ifdef CONFIG_KALLSYMS
 
 #include <linux/kallsyms.h>
+#include "kallsyms.h"
 
 static inline
 int wrapper_register_ftrace_function_probe(char *glob,
@@ -24,7 +39,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 +55,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 +68,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 */