X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fsplice.c;h=b0f8738b03b3cf5c06dd918af49cada27e6919fb;hb=d072dbc6353855937ca51f2c3746ad25ad21d978;hp=44a4d6b87b2b8062b571ed6270b4556006e8572a;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git diff --git a/wrapper/splice.c b/wrapper/splice.c index 44a4d6b8..b0f8738b 100644 --- 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 */ -#ifdef CONFIG_KALLSYMS +#include + +#if (defined(CONFIG_KALLSYMS) \ + && (LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0))) #include #include @@ -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 {