diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-16 12:23:08 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-17 22:38:32 +0000 |
| commit | a6f71564ab21e8f95ee652360a72050093f3b124 (patch) | |
| tree | 515613926d02eee9ad9345c9370e3bbc46abf1a7 /meta/recipes-kernel/lttng/lttng-modules | |
| parent | 115566c21703ae1a28db4aea74a012f668df6796 (diff) | |
| download | poky-a6f71564ab21e8f95ee652360a72050093f3b124.tar.gz | |
lttng-modules: Upgrade 2.13.16 -> 2.13.17
Drop patch now applied in the new release.
(From OE-Core rev: d6a9a41a2ef2d06aeca7742ecb0a40d45740989b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules')
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch | 51 |
1 files changed, 0 insertions, 51 deletions
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 bb40ff7243..0000000000 --- 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 @@ | |||
| 1 | From 74cdd186fdd540b98ecded94d506b812d7d2bae5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Kienan Stewart <kstewart@efficios.com> | ||
| 3 | Date: Sun, 22 Dec 2024 17:39:35 +0800 | ||
| 4 | Subject: [PATCH] Fix: sched_stat_runtime changed in Linux 6.6.66 | ||
| 5 | |||
| 6 | The following commit has been backported into the 6.6.y branch. | ||
| 7 | |||
| 8 | See upstream commit: | ||
| 9 | |||
| 10 | commit 5fe6ec8f6ab549b6422e41551abb51802bd48bc7 | ||
| 11 | Author: Peter Zijlstra <peterz@infradead.org> | ||
| 12 | Date: Mon Nov 6 13:41:43 2023 +0100 | ||
| 13 | |||
| 14 | sched: Remove vruntime from trace_sched_stat_runtime() | ||
| 15 | |||
| 16 | Tracing the runtime delta makes sense, observer can sum over time. | ||
| 17 | Tracing the absolute vruntime makes less sense, inconsistent: | ||
| 18 | absolute-vs-delta, but also vruntime delta can be computed from | ||
| 19 | runtime delta. | ||
| 20 | |||
| 21 | Removing the vruntime thing also makes the two tracepoint sites | ||
| 22 | identical, allowing to unify the code in a later patch. | ||
| 23 | |||
| 24 | Change-Id: I74acf0b8340c371e8411116e07e5c97b10f9c756 | ||
| 25 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
| 26 | |||
| 27 | Upstream-Status: Pending [https://review.lttng.org/c/lttng-modules/+/13813] | ||
| 28 | |||
| 29 | [Xiangyu: BP to fix compile error on linux 6.6.66, Minor conflict resolution] | ||
| 30 | Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> | ||
| 31 | --- | ||
| 32 | include/instrumentation/events/sched.h | 3 ++- | ||
| 33 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 34 | |||
| 35 | diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h | ||
| 36 | index 32d18133..0c62f2e6 100644 | ||
| 37 | --- a/include/instrumentation/events/sched.h | ||
| 38 | +++ b/include/instrumentation/events/sched.h | ||
| 39 | @@ -647,7 +647,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_blocked, | ||
| 40 | #endif | ||
| 41 | |||
| 42 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0) || \ | ||
| 43 | - LTTNG_RHEL_KERNEL_RANGE(5,14,0,452,0,0, 5,15,0,0,0,0)) | ||
| 44 | + LTTNG_RHEL_KERNEL_RANGE(5,14,0,452,0,0, 5,15,0,0,0,0) || \ | ||
| 45 | + LTTNG_KERNEL_RANGE(6,6,66, 6,7,0)) | ||
| 46 | /* | ||
| 47 | * Tracepoint for accounting runtime (time the task is executing | ||
| 48 | * on a CPU). | ||
| 49 | -- | ||
| 50 | 2.43.0 | ||
| 51 | |||
