diff options
author | Denys Dmytriyenko <denis@denix.org> | 2024-01-25 23:15:59 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-27 08:20:03 +0000 |
commit | c4a9b044d85a802a3455f934e4bc9eeb33437df3 (patch) | |
tree | 9316d00e611988d5dd982190ec99c947a54d7962 /meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-fdtable-adjust-fd-lookup-to-v6.7.patch | |
parent | bcbb15563503736e16b4cd850a53378adf1760f5 (diff) | |
download | poky-c4a9b044d85a802a3455f934e4bc9eeb33437df3.tar.gz |
lttng-modules: upgrade 2.13.10 -> 2.13.11
Changelog:
https://lwn.net/Articles/957396/
Drop 2 backported patches and 1 implemented differently upstream.
(From OE-Core rev: 90eef01e2d7fbde43e8325f075383d0931924cc8)
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-fdtable-adjust-fd-lookup-to-v6.7.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-fdtable-adjust-fd-lookup-to-v6.7.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-fdtable-adjust-fd-lookup-to-v6.7.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-fdtable-adjust-fd-lookup-to-v6.7.patch deleted file mode 100644 index b374483517..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-fdtable-adjust-fd-lookup-to-v6.7.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 76e4ea0c33a8c7726c0df28083d5c8bc1c1335e8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
3 | Date: Thu, 23 Nov 2023 13:49:51 -0500 | ||
4 | Subject: [PATCH] wrapper/fdtable: adjust fd lookup to v6.7+ | ||
5 | |||
6 | commit 0ede61d8589cc2d93 [file: convert to SLAB_TYPESAFE_BY_RCU] | ||
7 | renames lookup_fd_rcu to lookup_fdget_rcu, so we need to | ||
8 | version adjust the fdtable wrapper accordingly. | ||
9 | |||
10 | Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2023-November/030667.html] | ||
11 | |||
12 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
13 | --- | ||
14 | include/wrapper/fdtable.h | 4 ++++ | ||
15 | 1 file changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/include/wrapper/fdtable.h b/include/wrapper/fdtable.h | ||
18 | index fa5f7207..aaf2b9e7 100644 | ||
19 | --- a/include/wrapper/fdtable.h | ||
20 | +++ b/include/wrapper/fdtable.h | ||
21 | @@ -16,7 +16,11 @@ | ||
22 | static inline | ||
23 | struct file *lttng_lookup_fd_rcu(unsigned int fd) | ||
24 | { | ||
25 | +#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(6,7,0)) | ||
26 | return lookup_fd_rcu(fd); | ||
27 | +#else | ||
28 | + return lookup_fdget_rcu(fd); | ||
29 | +#endif | ||
30 | } | ||
31 | #else | ||
32 | static inline | ||
33 | -- | ||
34 | 2.34.1 | ||
35 | |||