public inbox for buildroot@busybox.net
 help / color / mirror / Atom feed
From: Bernd Kuhls <bernd@kuhls.net>
To: buildroot@buildroot.org
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [Buildroot] [PATCH 1/1] package/igh-ethercat: fix build with kernel >= 6.15
Date: Sun, 15 Mar 2026 20:17:48 +0100	[thread overview]
Message-ID: <20260315191748.762183-1-bernd@kuhls.net> (raw)

Buildroot commit c6e914819774212e79be19f62706f653b9646f11 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:
https://gitlab.com/etherlab.org/ethercat/-/commit/240080f11062cca42f9132cd32fad3b993502665

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>
---
 ...new-timer-interface-since-kernel-6.1.patch | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 package/igh-ethercat/0001-tty-Implemented-new-timer-interface-since-kernel-6.1.patch

diff --git a/package/igh-ethercat/0001-tty-Implemented-new-timer-interface-since-kernel-6.1.patch b/package/igh-ethercat/0001-tty-Implemented-new-timer-interface-since-kernel-6.1.patch
new file mode 100644
index 0000000000..5e568eaba9
--- /dev/null
+++ b/package/igh-ethercat/0001-tty-Implemented-new-timer-interface-since-kernel-6.1.patch
@@ -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
+
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

             reply	other threads:[~2026-03-15 19:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-15 19:17 Bernd Kuhls [this message]
2026-03-21 11:25 ` [Buildroot] [PATCH 1/1] package/igh-ethercat: fix build with kernel >= 6.15 Julien Olivain via buildroot
2026-03-27 10:03 ` Thomas Perale via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260315191748.762183-1-bernd@kuhls.net \
    --to=bernd@kuhls.net \
    --cc=buildroot@buildroot.org \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox