summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/lttng/lttng-modules/0003-Fix-pipe-stop-using-can_merge-v5.1.patch
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2019-05-19 21:38:09 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2019-05-21 14:54:56 +0800
commit886d2063cd54069f831239febf2be118ab774d01 (patch)
treec87ae8a2363f532a9a1c5d36ecc0ce5054565a97 /recipes-kernel/lttng/lttng-modules/0003-Fix-pipe-stop-using-can_merge-v5.1.patch
parent8cd484abb6f5728f4dcbb4d760d81a2e66240159 (diff)
downloadmeta-intel-886d2063cd54069f831239febf2be118ab774d01.tar.gz
lttng-modules: add bbappend
Backport patches from upstream to fix build errors when building with kernel v5.1. These patches are backported from stable branch. The code v5.1 is protected by ifdefs so v4.19 works as well. Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-kernel/lttng/lttng-modules/0003-Fix-pipe-stop-using-can_merge-v5.1.patch')
-rw-r--r--recipes-kernel/lttng/lttng-modules/0003-Fix-pipe-stop-using-can_merge-v5.1.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/recipes-kernel/lttng/lttng-modules/0003-Fix-pipe-stop-using-can_merge-v5.1.patch b/recipes-kernel/lttng/lttng-modules/0003-Fix-pipe-stop-using-can_merge-v5.1.patch
new file mode 100644
index 00000000..bc028537
--- /dev/null
+++ b/recipes-kernel/lttng/lttng-modules/0003-Fix-pipe-stop-using-can_merge-v5.1.patch
@@ -0,0 +1,43 @@
1From 9a203973ad3cbefb67a6032fd66e746d19b2d1c3 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Mon, 18 Mar 2019 16:20:34 -0400
4Subject: [PATCH 3/5] Fix: pipe: stop using ->can_merge (v5.1)
5
6See upstream commit:
7
8 commit 01e7187b41191376cee8bea8de9f907b001e87b4
9 Author: Jann Horn <jannh@google.com>
10 Date: Wed Jan 23 15:19:18 2019 +0100
11
12 pipe: stop using ->can_merge
13
14 Al Viro pointed out that since there is only one pipe buffer type to which
15 new data can be appended, it isn't necessary to have a ->can_merge field in
16 struct pipe_buf_operations, we can just check for a magic type.
17
18Upstream-Status: Backport [http://git.lttng.org/?p=lttng-modules.git;a=commit;h=d6cd2c9598a06f0ba1ba885bbe754e8836528310]
19
20Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
21Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
22Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
23---
24 lib/ringbuffer/ring_buffer_splice.c | 2 ++
25 1 file changed, 2 insertions(+)
26
27diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c
28index 8d14666..93cad29 100644
29--- a/lib/ringbuffer/ring_buffer_splice.c
30+++ b/lib/ringbuffer/ring_buffer_splice.c
31@@ -56,7 +56,9 @@ static void lib_ring_buffer_pipe_buf_release(struct pipe_inode_info *pipe,
32 }
33
34 static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
35+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,1,0))
36 .can_merge = 0,
37+#endif
38 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0))
39 .map = generic_pipe_buf_map,
40 .unmap = generic_pipe_buf_unmap,
41--
422.17.0
43