From: Xiangyu Chen <[email protected]> Add 0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch to adjust Brtfs probe header for 6.18[1]
Change Log: 2026-02-09 LTTng modules 2.14.4 * fix: Manual conversion to use ->i_state accessors (v6.19) * fix: btrfs: headers cleanup to remove unnecessary local includes (v6.19) * Fix: Initialize syscall tables sorted entries * Cleanup lttng-syscalls.h: Remove extern on function prototypes * Make init_event_desc_enum_desc_sorted_entries public * Update .gitreview for stable-2.14 Ref: [1] https://git.lttng.org/?p=lttng-modules.git;a=commit;h=ca93dc3b05fcb22db5b653858a1b08002496d783 Signed-off-by: Xiangyu Chen <[email protected]> --- ...st-range-in-btrfs-probe-for-v6.18.14.patch | 36 +++++++++++++++++++ ...ules_2.14.3.bb => lttng-modules_2.14.4.bb} | 3 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch rename meta/recipes-kernel/lttng/{lttng-modules_2.14.3.bb => lttng-modules_2.14.4.bb} (89%) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch new file mode 100644 index 0000000000..662a803680 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch @@ -0,0 +1,36 @@ +From de7ca66c797ba0b3273a217a47c8fb791d896f7c Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <[email protected]> +Date: Fri, 27 Feb 2026 17:54:39 -0500 +Subject: [PATCH] fix: adjust range in btrfs probe for v6.18.14 + +Upstream commit c5667f9c8eb9 ("btrfs: headers cleanup to remove +unnecessary local includes") was backported in v6.18.14, adjust the +range accordingly in the btrfs probe. + +Upstream-Status: Backport from commit ca93dc3b05fcb + +Change-Id: I51c5cb6345c6a1e1aa4e5e3cb9a4af2ec962ecb2 +Signed-off-by: Michael Jeanson <[email protected]> +Signed-off-by: Mathieu Desnoyers <[email protected]> +Signed-off-by: Xiangyu Chen <[email protected]> +--- + include/instrumentation/events/btrfs.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h +index feb4f40b..e87f0085 100644 +--- a/include/instrumentation/events/btrfs.h ++++ b/include/instrumentation/events/btrfs.h +@@ -12,7 +12,8 @@ + #include <linux/writeback.h> + #include <lttng/kernel-version.h> + +-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0)) ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0) || \ ++ LTTNG_KERNEL_RANGE(6,18,14, 6,19,0)) + #include <../fs/btrfs/ordered-data.h> + #endif + +-- +2.47.3 + diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.14.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.14.4.bb similarity index 89% rename from meta/recipes-kernel/lttng/lttng-modules_2.14.3.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.14.4.bb index 6a1bd6a27d..722b1ac5dd 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.14.3.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.14.4.bb @@ -14,8 +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-adjust-range-in-btrfs-probe-for-v6.18.14.patch \ " -SRC_URI[sha256sum] = "35a1875ad96e8b4b6aa8729f59af350bfc788ba65c6856deaa84d33acc0f28c2" +SRC_URI[sha256sum] = "63deefbc15d9ce7c43d858187533367b01dcb6e8469d6b69ccb757d6d3dbb0ad" export INSTALL_MOD_DIR = "kernel/lttng-modules" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#233029): https://lists.openembedded.org/g/openembedded-core/message/233029 Mute This Topic: https://lists.openembedded.org/mt/118293261/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
