diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0017-fix-random-remove-unused-tracepoints-v5.18.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0017-fix-random-remove-unused-tracepoints-v5.18.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0017-fix-random-remove-unused-tracepoints-v5.18.patch b/meta/recipes-kernel/lttng/lttng-modules/0017-fix-random-remove-unused-tracepoints-v5.18.patch new file mode 100644 index 0000000000..3fc7fd733d --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0017-fix-random-remove-unused-tracepoints-v5.18.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 25b70c486bb96de0caf7cea1da42ed07801cca84 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Mon, 4 Apr 2022 14:33:42 -0400 | ||
4 | Subject: [PATCH 17/19] fix: random: remove unused tracepoints (v5.18) | ||
5 | |||
6 | See upstream commit : | ||
7 | |||
8 | commit 14c174633f349cb41ea90c2c0aaddac157012f74 | ||
9 | Author: Jason A. Donenfeld <Jason@zx2c4.com> | ||
10 | Date: Thu Feb 10 16:40:44 2022 +0100 | ||
11 | |||
12 | random: remove unused tracepoints | ||
13 | |||
14 | These explicit tracepoints aren't really used and show sign of aging. | ||
15 | It's work to keep these up to date, and before I attempted to keep them | ||
16 | up to date, they weren't up to date, which indicates that they're not | ||
17 | really used. These days there are better ways of introspecting anyway. | ||
18 | |||
19 | Upstream-Status: Backport [369d82bb1746447514c877088d7c5fd0f39140f8] | ||
20 | Change-Id: I3b8c3e2732e7efdd76ce63204ac53a48784d0df6 | ||
21 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
22 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
23 | --- | ||
24 | probes/Kbuild | 5 ++++- | ||
25 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/probes/Kbuild b/probes/Kbuild | ||
28 | index 3ae2d39e..58da82b8 100644 | ||
29 | --- a/probes/Kbuild | ||
30 | +++ b/probes/Kbuild | ||
31 | @@ -215,8 +215,11 @@ ifneq ($(CONFIG_FRAME_WARN),0) | ||
32 | CFLAGS_lttng-probe-printk.o += -Wframe-larger-than=2200 | ||
33 | endif | ||
34 | |||
35 | +# Introduced in v3.6, remove in v5.18 | ||
36 | obj-$(CONFIG_LTTNG) += $(shell \ | ||
37 | - if [ $(VERSION) -ge 4 \ | ||
38 | + if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \ | ||
39 | + -a \ | ||
40 | + $(VERSION) -ge 4 \ | ||
41 | -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \ | ||
42 | -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 5 -a $(SUBLEVEL) -ge 2 \) \ | ||
43 | -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 4 -a $(SUBLEVEL) -ge 9 \) \ | ||
44 | -- | ||
45 | 2.35.1 | ||
46 | |||