diff mbox series

[35/43] lttng-modules: Upgrade 2.13.16 -> 2.13.17

Message ID 20250316161209.3629986-35-richard.purdie@linuxfoundation.org
State New
Headers show
Series [01/43] cairo: upgrade 1.18.2 -> 1.18.4 | expand

Commit Message

Richard Purdie March 16, 2025, 4:12 p.m. UTC 
Drop patch now applied in the new release.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 ...stat_runtime-changed-in-Linux-6.6.66.patch | 51 -------------------
 ...es_2.13.16.bb => lttng-modules_2.13.17.bb} |  3 +-
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch
 rename meta/recipes-kernel/lttng/{lttng-modules_2.13.16.bb => lttng-modules_2.13.17.bb} (89%)
diff mbox series

Patch

diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch
deleted file mode 100644
index bb40ff72433..00000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch
+++ /dev/null
@@ -1,51 +0,0 @@ 
-From 74cdd186fdd540b98ecded94d506b812d7d2bae5 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 32d18133..0c62f2e6 100644
---- a/include/instrumentation/events/sched.h
-+++ b/include/instrumentation/events/sched.h
-@@ -647,7 +647,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_blocked,
- #endif
- 
- #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0) || \
--	LTTNG_RHEL_KERNEL_RANGE(5,14,0,452,0,0, 5,15,0,0,0,0))
-+	LTTNG_RHEL_KERNEL_RANGE(5,14,0,452,0,0, 5,15,0,0,0,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
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.17.bb
similarity index 89%
rename from meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.13.17.bb
index c9d5ccdab1c..0657112c14a 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.17.bb
@@ -14,10 +14,9 @@  SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
 
 # Use :append here so that the patch is applied also when using devupstream
 SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \
-                   file://0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch \
                 "
 
-SRC_URI[sha256sum] = "6694414a3701fcd6e05b3cb20cfecae3b46b3dfb9e5361b344851c1f8052e854"
+SRC_URI[sha256sum] = "b0b23504150ae5c1fc6ee14e28d029518f61fe2ec5f17bb61c7941aa52bb6e65"
 
 export INSTALL_MOD_DIR = "kernel/lttng-modules"