X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_splice.c;h=8d146667d41c0327c5a5847965fd77bc7ccc2f23;hb=08ff387dbcbf626a171a50d0cbdee7b103997c56;hp=a1988f0bfd4adf847cfd8111931591c1e59152ff;hpb=0112cb7bc68d85c9c98b496937bde7af50f13cc6;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c
index a1988f0b..8d146667 100644
--- a/lib/ringbuffer/ring_buffer_splice.c
+++ b/lib/ringbuffer/ring_buffer_splice.c
@@ -27,10 +27,10 @@
 #include <linux/fs.h>
 #include <linux/version.h>
 
-#include "../../wrapper/splice.h"
-#include "../../wrapper/ringbuffer/backend.h"
-#include "../../wrapper/ringbuffer/frontend.h"
-#include "../../wrapper/ringbuffer/vfs.h"
+#include <wrapper/splice.h>
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/ringbuffer/vfs.h>
 
 #if 0
 #define printk_dbg(fmt, args...) printk(fmt, args)
@@ -95,7 +95,9 @@ static int subbuf_splice_actor(struct file *in,
 		.pages = pages,
 		.nr_pages = 0,
 		.partial = partial,
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0))
 		.flags = flags,
+#endif
 		.ops = &ring_buffer_pipe_buf_ops,
 		.spd_release = lib_ring_buffer_page_release,
 	};