]>
Commit | Line | Data |
---|---|---|
5041df65 JR |
1 | From 369d82bb1746447514c877088d7c5fd0f39140f8 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 06/13] 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 | Change-Id: I3b8c3e2732e7efdd76ce63204ac53a48784d0df6 | |
20 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | |
21 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | |
22 | --- | |
23 | src/probes/Kbuild | 5 ++++- | |
24 | 1 file changed, 4 insertions(+), 1 deletion(-) | |
25 | ||
26 | diff --git a/src/probes/Kbuild b/src/probes/Kbuild | |
27 | index e26b4359..8d6ff0f2 100644 | |
28 | --- a/src/probes/Kbuild | |
29 | +++ b/src/probes/Kbuild | |
30 | @@ -187,8 +187,11 @@ ifneq ($(CONFIG_FRAME_WARN),0) | |
31 | CFLAGS_lttng-probe-printk.o += -Wframe-larger-than=2200 | |
32 | endif | |
33 | ||
34 | +# Introduced in v3.6, remove in v5.18 | |
35 | obj-$(CONFIG_LTTNG) += $(shell \ | |
36 | - if [ $(VERSION) -ge 4 \ | |
37 | + if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \ | |
38 | + -a \ | |
39 | + $(VERSION) -ge 4 \ | |
40 | -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \ | |
41 | -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 5 -a $(SUBLEVEL) -ge 2 \) \ | |
42 | -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 4 -a $(SUBLEVEL) -ge 9 \) \ | |
43 | -- | |
44 | 2.36.1 | |
45 |