Remove dependency on kallsyms for splice_to_pipe (kernel 4.2+)

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

diff --git a/wrapper/splice.c b/wrapper/splice.c
index 44a4d6b87b2b8062b571ed6270b4556006e8572a..b0f8738b03b3cf5c06dd918af49cada27e6919fb 100644 (file)
--- a/wrapper/splice.c
+++ b/wrapper/splice.c
@@ -4,12 +4,15 @@
  *
  * 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.
  *
  * 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>
@@ -24,7 +27,7 @@ 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_funcptr("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 {