Skip to contentSkip to conversation

Fix: update ringbuffer for kernel 4.12

PATCH Mathieu Desnoyers 1 participant 1 message May 24, 2017 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Mathieu Desnoyers

author Applied
#1 lore raw

Merged into master, 2.10, 2.9, 2.8, thanks!

Quoted 26 lines · ----- On May 23, 2017, at 9:45 PM, Michael Jeanson [email protected] wrote:

flags removed from splice_pipe_desc in 4.12.

See upstream commit f81dc7d7d5a2528f98f26a0b9406e822d0b35011

---
lib/ringbuffer/ring_buffer_splice.c | 2 ++

1 file changed, 2 insertions(+)
lib/ringbuffer/ring_buffer_splice.c +2 -1
index 0610caa..8d14666 100644
@@ -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

Signature · 7 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev