projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ba224eea62fb39b9ba6a0bcb84b1e1d1dc53305e..2ecc98f38bf706eea4ef476fc99c7b4ae85ae85e 100644
(file)
--- a/
wrapper/splice.c
+++ b/
wrapper/splice.c
@@
-1,19
+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
* 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 <linux/kallsyms.h>
#include <linux/fs.h>
#include <linux/splice.h>
-#include
"kallsyms.h"
+#include
<wrapper/kallsyms.h>
static
ssize_t (*splice_to_pipe_sym)(struct pipe_inode_info *pipe,
static
ssize_t (*splice_to_pipe_sym)(struct pipe_inode_info *pipe,
@@
-27,7
+31,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.031009 seconds
and
4
git commands to generate.