diff options
author | Marek Vasut <marex@denx.de> | 2020-03-29 23:23:14 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-17 08:29:02 +0100 |
commit | eb029c9ac0f5820c05912760a95388827a6d3f0d (patch) | |
tree | 2b6b63beeb8b1cc03f430bfbeeb9d7f12de66869 /meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch | |
parent | 782cde184e1e04279d727e3ce78bc34ce6cf1243 (diff) | |
download | poky-eb029c9ac0f5820c05912760a95388827a6d3f0d.tar.gz |
lttng-modules: update to 2.10.14
Upgrade to version 2.10.14 in order to fix some build errors
with latest 5.4 kernel.
- conflicting types for 'trace_rcu_dyntick'
Reproductible on kernel greater than v5.4.22, starting with commit
6cf539a87a ("rcu: Fix data-race due to atomic_t copy-by-value")
Also drop patches which are no longer required.
(From OE-Core rev: 88cce1d9d06ed4c5a7b58a31d75cfd1503605df9)
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Armin Kuster <akuster808@gmail.com>
Cc: Daniel Dragomir <Daniel.Dragomir@windriver.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch deleted file mode 100644 index 03264bac68..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 032a74d83b263c4faead8e4c25d497fb8ea07b6e Mon Sep 17 00:00:00 2001 | ||
2 | From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
3 | Date: Thu, 12 Dec 2019 10:29:02 -0500 | ||
4 | Subject: [PATCH 2/4] Fix: sunrpc: null rpc_clnt dereference in rpc_task_queued | ||
5 | tracepoint | ||
6 | |||
7 | Based on upstream Linux commit: | ||
8 | |||
9 | commit 0be283f676a1e7b208db0c992283197ef8b52158 | ||
10 | Author: Benjamin Coddington <bcodding@redhat.com> | ||
11 | Date: Tue Jan 23 09:32:35 2018 -0500 | ||
12 | |||
13 | SUNRPC: Fix null rpc_clnt dereference in rpc_task_queued tracepoint | ||
14 | |||
15 | Backchannel tasks will not have a reference to the rpc_clnt. Return -1 for | ||
16 | cl_clid in that case. | ||
17 | |||
18 | Signed-off-by: Benjamin Coddington <bcodding@redhat.com> | ||
19 | Signed-off-by: Trond Myklebust <trondmy@gmail.com> | ||
20 | |||
21 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
22 | Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/8f83a9103dcdf4f6b73783427fc5ded4869309d5] | ||
23 | Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> | ||
24 | --- | ||
25 | instrumentation/events/lttng-module/rpc.h | 3 ++- | ||
26 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h | ||
29 | index fb13106..68c622c 100644 | ||
30 | --- a/instrumentation/events/lttng-module/rpc.h | ||
31 | +++ b/instrumentation/events/lttng-module/rpc.h | ||
32 | @@ -176,7 +176,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, | ||
33 | |||
34 | TP_FIELDS( | ||
35 | ctf_integer(unsigned int, task_id, task->tk_pid) | ||
36 | - ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) | ||
37 | + ctf_integer(unsigned int, client_id, task->tk_client ? | ||
38 | + task->tk_client->cl_clid : -1) | ||
39 | ctf_integer(unsigned long, timeout, task->tk_timeout) | ||
40 | ctf_integer(unsigned long, runstate, task->tk_runstate) | ||
41 | ctf_integer(int, status, task->tk_status) | ||
42 | -- | ||
43 | 2.17.1 | ||
44 | |||