From 08ff387dbcbf626a171a50d0cbdee7b103997c56 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 23 May 2017 15:45:47 -0400 Subject: [PATCH] Fix: update ringbuffer for kernel 4.12 flags removed from splice_pipe_desc in 4.12. See upstream commit f81dc7d7d5a2528f98f26a0b9406e822d0b35011 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- lib/ringbuffer/ring_buffer_splice.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c index 0610caaf..8d146667 100644 --- a/lib/ringbuffer/ring_buffer_splice.c +++ b/lib/ringbuffer/ring_buffer_splice.c @@ -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, }; -- 2.34.1