From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Wed, 24 May 2017 16:13:00 +0000 (UTC)
Subject: [lttng-dev] [PATCH lttng-modules] Fix: update ringbuffer for
	kernel 4.12
In-Reply-To: <1495568747-29103-1-git-send-email-mjeanson@efficios.com>
References: <1495568747-29103-1-git-send-email-mjeanson@efficios.com>
Message-ID: <1735213547.24136.1495642380183.JavaMail.zimbra@efficios.com>

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