* [lttng-dev] [PATCH lttng-modules] Fix: update ringbuffer for kernel 4.12
[not found] <1495568747-29103-1-git-send-email-mjeanson@efficios.com>
@ 2017-05-24 16:13 ` Mathieu Desnoyers
0 siblings, 0 replies; only message in thread
From: Mathieu Desnoyers @ 2017-05-24 16:13 UTC (permalink / raw)
Merged into master, 2.10, 2.9, 2.8, thanks!
----- On May 23, 2017, at 9:45 PM, Michael Jeanson mjeanson at efficios.com wrote:
> flags removed from splice_pipe_desc in 4.12.
>
> See upstream commit f81dc7d7d5a2528f98f26a0b9406e822d0b35011
>
> Signed-off-by: Michael Jeanson <mjeanson at 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-05-24 16:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1495568747-29103-1-git-send-email-mjeanson@efficios.com>
2017-05-24 16:13 ` [lttng-dev] [PATCH lttng-modules] Fix: update ringbuffer for kernel 4.12 Mathieu Desnoyers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox