mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-01 13:18:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/igh-ethercat: fix build with kernel >= 6.15

Browse Source 
Buildroot commit c6e9148197 bumped the
package from 1.6.3 to 1.6.8. The previous version 1.6.3 failed to build
with kernel >= 6.15 as seen here:
https://autobuild.buildroot.net/results/7f4/7f4b3e632a5de67dec2624a2097045ec4d767246/
"examples/mini/mini.c:528:5: error: implicit declaration of function
 'del_timer_sync' [-Wimplicit-function-declaration]
  528 |     del_timer_sync(&timer);"

The bump to 1.6.8 includes a commit which fixes the problem:
240080f110

but it only masked other build errors which were found by the
autobuilders:
https://autobuild.buildroot.net/results/1a5/1a546ee2217e7843b852a5b79b477ef23df6a064/
"examples/tty/tty.c:236:5: error: implicit declaration of function
 'del_timer_sync' [-Wimplicit-function-declaration]
  236 |     del_timer_sync(&timer);"

which need similar fixes.

Fixes:
https://autobuild.buildroot.net/results/0ba/0ba7163e5012309d3a31aa7186ca95a9d5c8de69/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2026-03-15 20:17:48 +01:00
committed by Julien Olivain
parent ef12f5bb2c
commit 7fe315a6f7
1 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
package/igh-ethercat/0001-tty-Implemented-new-timer-interface-since-kernel-6.1.patch Normal file
View File

@@ -0,0 +1,63 @@
From e32e99f8b8ec02a340ad3b93cc8abd36781ff568 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd@kuhls.net>
Date: Sun, 15 Mar 2026 20:06:42 +0100
Subject: [PATCH] tty: Implemented new timer interface since kernel 6.15
Upstream: https://gitlab.com/etherlab.org/ethercat/-/merge_requests/187
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
examples/tty/tty.c | 4 ++++
tty/module.c | 8 ++++++++
2 files changed, 12 insertions(+)
diff --git a/examples/tty/tty.c b/examples/tty/tty.c
index 4d47a49..e5b4d52 100644
--- a/examples/tty/tty.c
+++ b/examples/tty/tty.c
@@ -233,7 +233,11 @@ static void __exit cleanup_mini_module(void)
{
printk(KERN_INFO PFX "Stopping...\n");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
+ timer_delete_sync(&timer);
+#else
del_timer_sync(&timer);
+#endif
free_serial_devices();
diff --git a/tty/module.c b/tty/module.c
index 2b7b22b..12ad1e7 100644
--- a/tty/module.c
+++ b/tty/module.c
@@ -292,7 +292,11 @@ static int ec_tty_init(ec_tty_t *t, int minor,
static void ec_tty_clear(ec_tty_t *tty)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
+ timer_delete_sync(&tty->timer);
+#else
del_timer_sync(&tty->timer);
+#endif
tty_unregister_device(tty_driver, tty->minor);
}
@@ -367,10 +371,14 @@ static void ec_tty_wakeup(struct timer_list *t)
static void ec_tty_wakeup(unsigned long data)
#endif
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
+ ec_tty_t *tty = timer_container_of(tty, t, timer);
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
ec_tty_t *tty = from_timer(tty, t, timer);
#else
ec_tty_t *tty = (ec_tty_t *) data;
+#endif
#endif
size_t to_recv;
--
2.47.3