Fix: update kvm instrumentation for Ubuntu 5.3.0-45

[lttng-modules.git] / wrapper / splice.c

diff --git a/wrapper/splice.c b/wrapper/splice.c
index edc499c835efd2278e128d37d6ab8be5d8fb322c..916ec95570a65d604f540ac30df2248e3ab5dca7 100644 (file)
--- a/wrapper/splice.c
+++ b/wrapper/splice.c
@@ -1,18 +1,36 @@
 /*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+ * wrapper/splice.c
  *
- * wrapper around vmalloc_sync_all. Using KALLSYMS to get its address when
+ * wrapper around splice_to_pipe. Using KALLSYMS to get its address when
  * available, else we need to have a kernel that exports this function to GPL
- * modules.
+ * modules. The export was introduced in kernel 4.2.
  *
- * 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
  */
 
-#ifdef CONFIG_KALLSYMS
+#include <lttng-kernel-version.h>
+
+#if (defined(CONFIG_KALLSYMS) \
+       && (LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)))
 
 #include <linux/kallsyms.h>
 #include <linux/fs.h>
 #include <linux/splice.h>
+#include <wrapper/kallsyms.h>
 
 static
 ssize_t (*splice_to_pipe_sym)(struct pipe_inode_info *pipe,
@@ -22,11 +40,11 @@ ssize_t wrapper_splice_to_pipe(struct pipe_inode_info *pipe,
                               struct splice_pipe_desc *spd)
 {
        if (!splice_to_pipe_sym)
-               splice_to_pipe_sym = (void *) kallsyms_lookup_name("splice_to_pipe");
+               splice_to_pipe_sym = (void *) kallsyms_lookup_funcptr("splice_to_pipe"); 
        if (splice_to_pipe_sym) {
                return splice_to_pipe_sym(pipe, spd);
        } else {
-               printk(KERN_WARNING "LTTng: splice_to_pipe symbol lookup failed.\n");
+               printk_once(KERN_WARNING "LTTng: splice_to_pipe symbol lookup failed.\n");
                return -ENOSYS;
        }
 }