Followup-For: Bug #1095902
Control: tag -1 patch
Control: fixed -1 debian/2.13.14-1
Attached are patches for bullseye and bookworm that adjust the
preprocessor condition in the same way as it was fixed upstream in
2.13.14.
Tested in bullseye/bookworm chroots with the bullseye kernel installed.
Andreas
Description: restore compatibility with Linux 5.10.220..5.11
Linux commit 460b4f812a9d473d4b39d87d37844f9fc30a9eb3 "file: Rename
fcheck lookup_fd_rcu" from v5.11-rc1 was backported to v5.10.220
(460b4f812a9d473d4b39d87d37844f9fc30a9eb3)
.
patch backported from lttng-modules 2.13.14
--- a/wrapper/fdtable.h
+++ b/wrapper/fdtable.h
@@ -12,7 +12,8 @@
#include <linux/fdtable.h>
#include <linux/sched.h>
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+#if ((LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) || \
+ LTTNG_KERNEL_RANGE(5,10,220, 5,11,0))
static inline
struct file *lttng_lookup_fd_rcu(unsigned int fd)
{
Description: restore compatibility with Linux 5.10.220..5.11
Linux commit 460b4f812a9d473d4b39d87d37844f9fc30a9eb3 "file: Rename
fcheck lookup_fd_rcu" from v5.11-rc1 was backported to v5.10.220
(460b4f812a9d473d4b39d87d37844f9fc30a9eb3)
.
patch backported from lttng-modules 2.13.14
--- a/include/wrapper/fdtable.h
+++ b/include/wrapper/fdtable.h
@@ -12,7 +12,8 @@
#include <linux/fdtable.h>
#include <linux/sched.h>
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+#if ((LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) || \
+ LTTNG_KERNEL_RANGE(5,10,220, 5,11,0))
static inline
struct file *lttng_lookup_fd_rcu(unsigned int fd)
{
