projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove lttng-ftrace integration
[lttng-modules.git]
/
wrapper
/
splice.c
diff --git
a/wrapper/splice.c
b/wrapper/splice.c
index 357e1ac5a84560dca04613ab718ca76a535d2032..916ec95570a65d604f540ac30df2248e3ab5dca7 100644
(file)
--- a/
wrapper/splice.c
+++ b/
wrapper/splice.c
@@
-3,7
+3,7
@@
*
* 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
*
* 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>
*
*
* Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
@@
-22,7
+22,10
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* 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/kallsyms.h>
#include <linux/fs.h>
@@
-41,7
+44,7
@@
ssize_t wrapper_splice_to_pipe(struct pipe_inode_info *pipe,
if (splice_to_pipe_sym) {
return splice_to_pipe_sym(pipe, spd);
} else {
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;
}
}
return -ENOSYS;
}
}
This page took
0.022987 seconds
and
4
git commands to generate.