kernel-module-emlog: Fix build with kernel 6.12+

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2024-12-14 10:01:34 -08:00
parent f0fab487e1
commit da51096bcf
No known key found for this signature in database
GPG Key ID: BB053355919D3314
5 changed files with 33 additions and 0 deletions

View File

@ -4,6 +4,7 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master"
SRC_URI += "file://0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch"
SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca"
PV = "0.70+git"
S = "${WORKDIR}/git"

View File

@ -0,0 +1,32 @@
From dca01ea62833249d78ac3bdf277b73424bf93e89 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 14 Dec 2024 09:55:10 -0800
Subject: [PATCH] emlog: Do not use no_llseek with kernel 6.12.0+
no_llseek is finally gone with 6.12-rc1 [1]
[1] https://github.com/torvalds/linux/commit/cb787f4ac0c2e439ea8d7e6387b925f74576bdf8
Upstream-Status: Submitted [https://github.com/nicupavel/emlog/pull/16]
---
emlog.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/emlog.c b/emlog.c
index 2ead738..b45c72d 100644
--- a/emlog.c
+++ b/emlog.c
@@ -464,7 +464,12 @@ static const struct file_operations emlog_fops = {
.open = emlog_open,
.release = emlog_release,
.poll = emlog_poll,
- .llseek = no_llseek, /* no_llseek by default introduced at v2.6.37-rc1 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
+ /* no_llseek by default introduced at v2.6.37-rc1 and
+ * removed in 6.12.0
+ */
+ .llseek = no_llseek,
+#endif
.owner = THIS_MODULE,
};