mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
lttng-modules: fix sched_stat_runtime changed in Linux 6.6.66
The following commit has been backported into the 6.6.y branch.
See upstream commit:
commit 5fe6ec8f6ab549b6422e41551abb51802bd48bc7
Author: Peter Zijlstra <peterz@infradead.org>
Date: Mon Nov 6 13:41:43 2023 +0100
sched: Remove vruntime from trace_sched_stat_runtime()
That caused building the lttng-modules report compile error:
tracepoint-event-impl.h:133:6: error: conflicting types for
'trace_sched_stat_runtime';
The fix is still pending on lttng review board, backport it to oe-core to
de-block the build issue.
(From OE-Core rev: 598b2f27d74e08eb6089eadad68f80b2f1ef71de)
Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
339c54b220
commit
ffa9b87ec8
@@ -0,0 +1,51 @@
|
||||
From a04234d63999f91405574928c80ded870dca157a Mon Sep 17 00:00:00 2001
|
||||
From: Kienan Stewart <kstewart@efficios.com>
|
||||
Date: Sun, 22 Dec 2024 17:39:35 +0800
|
||||
Subject: [PATCH] Fix: sched_stat_runtime changed in Linux 6.6.66
|
||||
|
||||
The following commit has been backported into the 6.6.y branch.
|
||||
|
||||
See upstream commit:
|
||||
|
||||
commit 5fe6ec8f6ab549b6422e41551abb51802bd48bc7
|
||||
Author: Peter Zijlstra <peterz@infradead.org>
|
||||
Date: Mon Nov 6 13:41:43 2023 +0100
|
||||
|
||||
sched: Remove vruntime from trace_sched_stat_runtime()
|
||||
|
||||
Tracing the runtime delta makes sense, observer can sum over time.
|
||||
Tracing the absolute vruntime makes less sense, inconsistent:
|
||||
absolute-vs-delta, but also vruntime delta can be computed from
|
||||
runtime delta.
|
||||
|
||||
Removing the vruntime thing also makes the two tracepoint sites
|
||||
identical, allowing to unify the code in a later patch.
|
||||
|
||||
Change-Id: I74acf0b8340c371e8411116e07e5c97b10f9c756
|
||||
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
|
||||
|
||||
Upstream-Status: Pending [https://review.lttng.org/c/lttng-modules/+/13813]
|
||||
|
||||
[Xiangyu: BP to fix compile error on linux 6.6.66, Minor conflict resolution]
|
||||
Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
|
||||
---
|
||||
include/instrumentation/events/sched.h | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h
|
||||
index 24cf37c8..637a1e3a 100644
|
||||
--- a/include/instrumentation/events/sched.h
|
||||
+++ b/include/instrumentation/events/sched.h
|
||||
@@ -646,7 +646,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_blocked,
|
||||
TP_ARGS(tsk, delay))
|
||||
#endif
|
||||
|
||||
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0) || \
|
||||
+ LTTNG_KERNEL_RANGE(6,6,66, 6,7,0))
|
||||
/*
|
||||
* Tracepoint for accounting runtime (time the task is executing
|
||||
* on a CPU).
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -14,6 +14,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
|
||||
file://0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch \
|
||||
file://0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch \
|
||||
file://0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch \
|
||||
file://0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch \
|
||||
"
|
||||
|
||||
# Use :append here so that the patch is applied also when using devupstream
|
||||
|
||||
Reference in New Issue
Block a user