diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-04-12 17:46:02 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-14 16:46:35 +0100 |
commit | b3ea0a07d46ebff0ae3fb02c7521ab971b3410db (patch) | |
tree | 756da88ee734e6ce3a1793aced818998f0fab0c0 /meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch | |
parent | 09fdbbcd193fdbb87af6dad57541e389a0a3a59f (diff) | |
download | poky-b3ea0a07d46ebff0ae3fb02c7521ab971b3410db.tar.gz |
lttng-modules: support kernel 5.18+
Backporting changes from lttng master to support building against
the 5.18+ kernel. No changes required to the patches. Once a new
-stable 2.13.x is released, we can drop these patches. To enable
newer kernel development against the LTS, it is worth pulling these
in while we wait for an upstream release.
(From OE-Core rev: 8a7237a47488442513741930ea55d69dd6bd7be4)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch new file mode 100644 index 0000000000..00367eebf8 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-tracepoint-event-allow-same-provider-and-event-n.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From a7eb2e3d0a4beb1ee80b132927641dd05ef2d542 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
3 | Date: Mon, 4 Apr 2022 15:49:32 -0400 | ||
4 | Subject: [PATCH 02/10] Fix: tracepoint event: allow same provider and event | ||
5 | name | ||
6 | |||
7 | Using the same name for the provider (TRACE_SYSTEM) and event name | ||
8 | causes a compilation error because the same identifiers are emitted | ||
9 | twice. | ||
10 | |||
11 | Fix this by prefixing the provider identifier with | ||
12 | "__provider_event_desc___". | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | |||
16 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
17 | Change-Id: I8cdf8f859e35b8bd5c19737860d12f1ed546dfc2 | ||
18 | --- | ||
19 | include/lttng/tracepoint-event-impl.h | 6 +++--- | ||
20 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
21 | |||
22 | diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h | ||
23 | index 38b1dc43..dcb22247 100644 | ||
24 | --- a/include/lttng/tracepoint-event-impl.h | ||
25 | +++ b/include/lttng/tracepoint-event-impl.h | ||
26 | @@ -1255,7 +1255,7 @@ static const struct lttng_kernel_event_desc __event_desc___##_map = { \ | ||
27 | #define TP_ID1(_token, _system) _token##_system | ||
28 | #define TP_ID(_token, _system) TP_ID1(_token, _system) | ||
29 | |||
30 | -static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE_SYSTEM)[] = { | ||
31 | +static const struct lttng_kernel_event_desc * const TP_ID(__provider_event_desc___, TRACE_SYSTEM)[] = { | ||
32 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) | ||
33 | }; | ||
34 | |||
35 | @@ -1274,8 +1274,8 @@ static const struct lttng_kernel_event_desc * const TP_ID(__event_desc___, TRACE | ||
36 | /* non-const because list head will be modified when registered. */ | ||
37 | static __used struct lttng_kernel_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { | ||
38 | .provider_name = __stringify(TRACE_SYSTEM), | ||
39 | - .event_desc = TP_ID(__event_desc___, TRACE_SYSTEM), | ||
40 | - .nr_events = ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)), | ||
41 | + .event_desc = TP_ID(__provider_event_desc___, TRACE_SYSTEM), | ||
42 | + .nr_events = ARRAY_SIZE(TP_ID(__provider_event_desc___, TRACE_SYSTEM)), | ||
43 | .head = { NULL, NULL }, | ||
44 | .lazy_init_head = { NULL, NULL }, | ||
45 | .lazy = 0, | ||
46 | -- | ||
47 | 2.19.1 | ||
48 | |||