X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fsplice.c;h=b0f8738b03b3cf5c06dd918af49cada27e6919fb;hb=d072dbc6353855937ca51f2c3746ad25ad21d978;hp=edc499c835efd2278e128d37d6ab8be5d8fb322c;hpb=5dd620faf35aaa3f5633435e22556d843f9cd4a5;p=lttng-modules.git

diff --git a/wrapper/splice.c b/wrapper/splice.c
index edc499c8..b0f8738b 100644
--- a/wrapper/splice.c
+++ b/wrapper/splice.c
@@ -1,18 +1,23 @@
-/*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
  *
- * wrapper around vmalloc_sync_all. Using KALLSYMS to get its address when
+ * wrapper/splice.c
+ *
+ * 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>
  */
 
-#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 +27,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;
 	}
 }