From nobody Sat Jan 31 05:19:53 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f31Rd4GHwz6Qvtm; Sat, 31 Jan 2026 05:20:29 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f31Rd3Dg8z3WmT; Sat, 31 Jan 2026 05:20:29 +0000 (UTC) (envelope-from nyan@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769836829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XI3q1ptQX/i7b5HfN7pdWLy9TvuKZz3C6eVCXZwuXeo=; b=m2rExOuiMSutoiTyNO2MeKuY8vbROt+lntmOr+EIcj6J66z6Og1M8LnUDabosOyHQ/wwZa /5DumoFzuRWecvzVDkpd1PoOVTtWRChLki3XdO6mRtNzmXD2ogEe8CvwY5e38v8DqZhgjW 0wZIPXKGiu/I1jmb1WAPDIaI2heqD/LaBcPFfrjTOkVZnRVvg3KpzO23KJDe/zlGJ6Z6OK 0EVpSFru78N0Xtmac5zHqVXv4CsxS/o6Nlbr67DkLm8qz4BoNuDIZ3P2MvC8bMxfCAvMph oDhtmInTjIH7/15iLTujR5vnsNIKvIWr4tdh1xUioxf0TlntahHvlhMKs3ggxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769836829; a=rsa-sha256; cv=none; b=PsMW3XrYw6XsBvNnLSzcFeLJBIlF+RBJKnbyrb307FYC7nmSDG/j/YZ7nntk5ezET8MAH5 UvPKMs1OwbGZaviSYP2VsYwdRqT1jv9TAkWLjBiE6SKTvXn/FAUFhGybDtGX15vjUsyuUX YfNzVkUL2Kj+wii4cKoysGPw7gyKsvbn9ab95cLsDimRG0G2vsv5DlxCrojS8vsf2vm1y9 fIJmxR53/aR73KCZe7k1JvytLbF/+RQaCNx6RzNhRc7lpJd7Z28eNxJUG3ugdJQekaW0tf wLc4nDp6gNF2Ks12gnjHyOa19Et22HuKYMyTLFvYfMC65rxXLQKlYgnYLxK16g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769836829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XI3q1ptQX/i7b5HfN7pdWLy9TvuKZz3C6eVCXZwuXeo=; b=uNLwtwVsOMMYbkhtqfisAxvAaRBZf5aObeeCC3GpdXyDXUZi4uggv9OKnXAIup7yrI/b6R q5F22tkVnUnfiGzEOohDpK4x/vhAwkguwj3XJRjOmZCaISvYkxHSryqiKx/FO89PPcbr0j YspaIh4q33WlzdFA8M+3ZJs1cOkA2uyRBGswsIFWnhBuW3dGLopP5uWazjwCDQMsbBNOaz nGGjCoPUSfz5gWgbweH0R/fZGQGShbcwx30yq32Q4wU8PiFQMpWcjNG38sMh4hLceOAlxA JAuAvz1XmLAKhir9eK2nsz/zYPggyN69GSXURZxhiRrcYkzJtDOd4BtDGMhqHA== Received: from localhost (s195024.ppp.asahi-net.or.jp [220.157.195.24]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: nyan/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f31Rb5khrz7db; Sat, 31 Jan 2026 05:20:27 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Date: Sat, 31 Jan 2026 14:19:53 +0900 (JST) Message-Id: <20260131.141953.969219623432820896.nyan@FreeBSD.org> To: bz@FreeBSD.org Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: c84bfaa25318 - stable/14 - LinuxKPI: timer KPI *_timer -> timer_* From: Yoshihiro Takahashi In-Reply-To: <696a9448.c84c.3cbc39d4@gitrepo.freebsd.org> References: <696a9448.c84c.3cbc39d4@gitrepo.freebsd.org> X-Mailer: Mew version 6.10 on Emacs 30.2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit This broke binary compatibility for the drm module. kernel: link_elf_obj: symbol del_timer_sync undefined kernel: linker_load_file: /boot/modules/drm.ko - unsupported file type kernel: KLD i915kms.ko: depends on drmn - not available or version mismatch kernel: linker_load_file: /boot/modules/i915kms.ko - unsupported file type In article <696a9448.c84c.3cbc39d4@gitrepo.freebsd.org> "Bjoern A. Zeeb" writes: > The branch stable/14 has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c84bfaa2531870a023fa9b267a765b9518ed3350 > > commit c84bfaa2531870a023fa9b267a765b9518ed3350 > Author: Bjoern A. Zeeb > AuthorDate: 2025-09-04 20:24:26 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2026-01-16 19:37:48 +0000 > > LinuxKPI: timer KPI *_timer -> timer_* > > del_timer() got renamed to timer_delete() approximately in Linux 6.2 > (similar for *_sync and likely others). > Keep the old functions as compat; unclear when we can gc them. > We should also re-define them with a linuxkpi_ prefix to avoid possible > conflicts in the future if we do a full pass over this at some point. > > Sponsored by: The FreeBSD Foundation (intiially) > Reviewed by: dumbbell > Differential Revision: https://reviews.freebsd.org/D52074 > > (cherry picked from commit 5cb64a1d3fe75526fb879ef4dce5860bbb4e4aea) > (cherry picked from commit 88198564dbd82a97d655e73459c03eccf7031331) > --- > sys/compat/linuxkpi/common/include/linux/timer.h | 16 ++++++++++++++-- > sys/compat/linuxkpi/common/src/linux_compat.c | 11 ++--------- > 2 files changed, 16 insertions(+), 11 deletions(-) > > diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h > index fe0e084cb790..9ab30f3003ac 100644 > --- a/sys/compat/linuxkpi/common/include/linux/timer.h > +++ b/sys/compat/linuxkpi/common/include/linux/timer.h > @@ -84,11 +84,23 @@ extern unsigned long linux_timer_hz_mask; > extern int mod_timer(struct timer_list *, int); > extern void add_timer(struct timer_list *); > extern void add_timer_on(struct timer_list *, int cpu); > -extern int del_timer(struct timer_list *); > -extern int del_timer_sync(struct timer_list *); > + > +extern int timer_delete(struct timer_list *); > extern int timer_delete_sync(struct timer_list *); > extern int timer_shutdown_sync(struct timer_list *); > > +static inline int > +del_timer(struct timer_list *tl) > +{ > + return (timer_delete(tl)); > +} > + > +static inline int > +del_timer_sync(struct timer_list *tl) > +{ > + return (timer_delete_sync(tl)); > +} > + > #define timer_pending(timer) callout_pending(&(timer)->callout) > #define round_jiffies(j) \ > ((int)(((j) + linux_timer_hz_mask) & ~linux_timer_hz_mask)) > diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c > index a2c2d18c8185..e5e3d7929759 100644 > --- a/sys/compat/linuxkpi/common/src/linux_compat.c > +++ b/sys/compat/linuxkpi/common/src/linux_compat.c > @@ -2052,7 +2052,7 @@ add_timer_on(struct timer_list *timer, int cpu) > } > > int > -del_timer(struct timer_list *timer) > +timer_delete(struct timer_list *timer) > { > > if (callout_stop(&(timer)->callout) == -1) > @@ -2061,7 +2061,7 @@ del_timer(struct timer_list *timer) > } > > int > -del_timer_sync(struct timer_list *timer) > +timer_delete_sync(struct timer_list *timer) > { > > if (callout_drain(&(timer)->callout) == -1) > @@ -2069,13 +2069,6 @@ del_timer_sync(struct timer_list *timer) > return (1); > } > > -int > -timer_delete_sync(struct timer_list *timer) > -{ > - > - return (del_timer_sync(timer)); > -} > - > int > timer_shutdown_sync(struct timer_list *timer) > { >