X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_splice.c;fp=lib%2Fringbuffer%2Fring_buffer_splice.c;h=52179a79986597f24352a5177f14cebfb02f0a9d;hb=d6cd2c9598a06f0ba1ba885bbe754e8836528310;hp=468641bc034e49723b14ce8b8c187f9aaf781f4e;hpb=92da05ce1f73488a57e7fd79e9c03113cefdb76f;p=deliverable%2Flttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c
index 468641bc..52179a79 100644
--- a/lib/ringbuffer/ring_buffer_splice.c
+++ b/lib/ringbuffer/ring_buffer_splice.c
@@ -43,7 +43,9 @@ static void lib_ring_buffer_pipe_buf_release(struct pipe_inode_info *pipe,
 }
 
 static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,1,0))
 	.can_merge = 0,
+#endif
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0))
 	.map = generic_pipe_buf_map,
 	.unmap = generic_pipe_buf_unmap,