From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Subject: [lttng-dev] [PATCH lttng-modules] Fix: update ringbuffer for kernel 4.12
Date: Wed, 24 May 2017 16:13:00 +0000 (UTC) [thread overview]
Message-ID: <1735213547.24136.1495642380183.JavaMail.zimbra@efficios.com> (raw)
In-Reply-To: <1495568747-29103-1-git-send-email-mjeanson@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
parent reply other threads:[~2017-05-24 16:13 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <1495568747-29103-1-git-send-email-mjeanson@efficios.com>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1735213547.24136.1495642380183.JavaMail.zimbra@efficios.com \
--to=mathieu.desnoyers@efficios.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox