X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_splice.c;h=bb91f45e01a303303b514814436d388ed9292c23;hb=9b9aff07ba39fba25ba8600fc60fa82fc392a0be;hp=3a7ff0c45cf86f7606d9d0751fe7a5db283daf3b;hpb=d83004aa718065e5221d8ef4b99e4302b70b3df9;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c
index 3a7ff0c4..bb91f45e 100644
--- a/lib/ringbuffer/ring_buffer_splice.c
+++ b/lib/ringbuffer/ring_buffer_splice.c
@@ -25,6 +25,7 @@
 
 #include <linux/module.h>
 #include <linux/fs.h>
+#include <linux/version.h>
 
 #include "../../wrapper/splice.h"
 #include "../../wrapper/ringbuffer/backend.h"
@@ -56,8 +57,10 @@ static void lib_ring_buffer_pipe_buf_release(struct pipe_inode_info *pipe,
 
 static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
 	.can_merge = 0,
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0))
 	.map = generic_pipe_buf_map,
 	.unmap = generic_pipe_buf_unmap,
+#endif
 	.confirm = generic_pipe_buf_confirm,
 	.release = lib_ring_buffer_pipe_buf_release,
 	.steal = generic_pipe_buf_steal,