Fix: update sched prev_state instrumentation for upstream kernel

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

diff --git a/wrapper/ftrace.h b/wrapper/ftrace.h
index 0f15ee4a31daca2942a28ea9d864ebf4255c98c5..eb4f788a50959249f979bf86da5cb643660c6c1e 100644 (file)
--- a/wrapper/ftrace.h
+++ b/wrapper/ftrace.h
@@ -1,22 +1,27 @@
-#ifndef _LTTNG_WRAPPER_FTRACE_H
-#define _LTTNG_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 "kallsyms.h"
+#include <wrapper/kallsyms.h>
 
 static inline
 int wrapper_register_ftrace_function_probe(char *glob,
@@ -29,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;
        }
 }
@@ -45,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);
        }
 }