summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-02-15 14:37:12 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-17 18:01:01 +0000
commitbdf854311cab5e18242afaefaba5db85be10d63c (patch)
tree1d1976c0bacf559f312ebf2cbdfb402c603783b1 /meta/recipes-kernel/lttng
parentca4721c64ab68d56fa00d99ea07fc444c87a4313 (diff)
downloadpoky-bdf854311cab5e18242afaefaba5db85be10d63c.tar.gz
lttng-modules: fix for kernel 6.2+
Backporting a patching from the 2.13.x stable branch of lttng to fix the build against kernel 6.2+. (From OE-Core rev: 3aed7dfe5ff6f52497dcffa58bc2f06cf709ea18) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch45
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb1
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch
new file mode 100644
index 0000000000..26ae605b31
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch
@@ -0,0 +1,45 @@
1From 69d3aa79a641f539cfd5c11b46b2dd9b4df9b0f0 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Mon, 16 Jan 2023 15:01:51 -0500
4Subject: [PATCH] fix: btrfs: move accessor helpers into accessors.h (v6.2)
5
6See upstream commit :
7
8 commit 07e81dc94474eb62705c6f96d9ab1a5a797b8703
9 Author: Josef Bacik <josef@toxicpanda.com>
10 Date: Wed Oct 19 10:51:00 2022 -0400
11
12 btrfs: move accessor helpers into accessors.h
13
14 This is a large patch, but because they're all macros it's impossible to
15 split up. Simply copy all of the item accessors in ctree.h and paste
16 them in accessors.h, and then update any files to include the header so
17 everything compiles.
18
19Upstream-Status: Backport
20
21Change-Id: I1f0876dd8b7a8687f6802b60c3e3baabd017cc52
22Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
23Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
24---
25 include/instrumentation/events/btrfs.h | 4 ++++
26 1 file changed, 4 insertions(+)
27
28diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
29index 785f16ac..01157107 100644
30--- a/include/instrumentation/events/btrfs.h
31+++ b/include/instrumentation/events/btrfs.h
32@@ -9,6 +9,10 @@
33 #include <linux/writeback.h>
34 #include <lttng/kernel-version.h>
35
36+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0))
37+#include <../fs/btrfs/accessors.h>
38+#endif
39+
40 #ifndef _TRACE_BTRFS_DEF_
41 #define _TRACE_BTRFS_DEF_
42 struct btrfs_root;
43--
442.34.1
45
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb
index 3cfc1bc58e..c04796be16 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb
@@ -13,6 +13,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
13 file://0009-Rename-genhd-wrapper-to-blkdev.patch \ 13 file://0009-Rename-genhd-wrapper-to-blkdev.patch \
14 file://fix-jbd2-use-the-correct-print-format-v5.10.163.patch \ 14 file://fix-jbd2-use-the-correct-print-format-v5.10.163.patch \
15 file://fix-jbd2-upper-bound-for-v5.10.163.patch \ 15 file://fix-jbd2-upper-bound-for-v5.10.163.patch \
16 file://0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch \
16 " 17 "
17 18
18# Use :append here so that the patch is applied also when using devupstream 19# Use :append here so that the patch is applied also when using devupstream