Remove dependency on kallsyms for splice_to_pipe (kernel 4.2+)
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Mon, 2 Mar 2020 16:03:19 +0000 (11:03 -0500)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Wed, 4 Mar 2020 14:59:33 +0000 (09:59 -0500)
Upstream commit 2b514574f7e88 "net: af_unix: implement splice for stream
af_unix sockets" exported the "splice_to_pipe" symbol, so use it to
remove a dependency on kallsyms_lookup_name().

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
wrapper/splice.c

index 44a4d6b87b2b8062b571ed6270b4556006e8572a..2ecc98f38bf706eea4ef476fc99c7b4ae85ae85e 100644 (file)
@@ -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>
This page took 0.025324 seconds and 4 git commands to generate.