Merged into master, 2.10, 2.9, 2.8, thanks! ----- On May 23, 2017, at 9:45 PM, Michael Jeanson mjean...@efficios.com wrote:
> flags removed from splice_pipe_desc in 4.12. > > See upstream commit f81dc7d7d5a2528f98f26a0b9406e822d0b35011 > > Signed-off-by: Michael Jeanson <mjean...@efficios.com> > --- > 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 0610caa..8d14666 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.7.4 -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
