Fix: Remove 'type' argument from access_ok() function (v5.0)

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

diff --git a/wrapper/ftrace.h b/wrapper/ftrace.h
index 064f9c7cab1dc5aed9a7045cef562bdfcbc4043d..eb4f788a50959249f979bf86da5cb643660c6c1e 100644 (file)
--- a/wrapper/ftrace.h
+++ b/wrapper/ftrace.h
@@ -1,7 +1,5 @@
-#ifndef _LTTNG_WRAPPER_FTRACE_H
-#define _LTTNG_WRAPPER_FTRACE_H
-
-/*
+/* 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
@@ -9,28 +7,21 @@
  * modules.
  *
  * 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
  */
 
+#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 "kallsyms.h"
+#include <wrapper/kallsyms.h>
 
 static inline
 int wrapper_register_ftrace_function_probe(char *glob,
@@ -43,7 +34,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 +50,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);
        }
 }