From nobody Sun Feb 1 16:46:05 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 4f3wcF3pnZz6Qg0R for ; Sun, 01 Feb 2026 16:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f3wcF3L9rz3kTg for ; Sun, 01 Feb 2026 16:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769964365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsVrzmM4UgsI5FBTjzh8sknz+HyNUgks0L0OpYsPskg=; b=jPU9jVKqV6ZhnaWwz1Fw5pPcIVJYxrGUpH8wd7ZKKNq7PI3OLDUX1MuBUGnccluVeiHa2y kQu65To6ekmJQeKZtkVcHElRIVhobsO/wZqiWp9smd13Re5Sy0vKPN5s6uLLobtJwemGsL RjTNqDjkjWjNrhzfFBRMCRdg7pw/ksatIFvVqdx5fakgvhdFiFux3vCNlMBRwXTkFXlLk9 e9M2wFmeGW9Eh2h949jlltIuZ8lK81eO17MXBXsYSat7QCHO1vskORMJcR2GlWrT5bC4Ia dURINmjI0W4lsF7OhtcgF1Ab1yd+VupSD7i+2g27vZ5Vc0sWfMCxZbueKlQHxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769964365; a=rsa-sha256; cv=none; b=TyKTvoiwtvx903hH+mnNLt1mQDSHINqGrZVYwLs0IvibJVVcE76WttmrYmLc8rEf1zw/bA /0yEwWT+0jBq3V8lKj4trQXH5kb+PGlF0t+VNhI4fIvNkitZa4oS/cdohzKWqRTjB8aVRW 31fpvX9ewlygXuOZPAZjRyT4y1cIkEvhCZ1k1iyfgM15Jk7PU6UMM6klOEd03aZ5cXna5r kaZlPj0WJIN4YqcYXVrCbSmSEXh2/YRyvOGPjcfonGYOmRzY6YvqkOUwvRRMlkxmjqG2a7 4dXvRH12X3DYhB6bjhNonV6AvyTXTok0HYsjeyzqM+70yEdwQqJKvhndIFqnIg== 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=1769964365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsVrzmM4UgsI5FBTjzh8sknz+HyNUgks0L0OpYsPskg=; b=ZACVA7QLjJwR8rTy1Rk5inlWbw3xdPtVpa3IiIsAGYusseLBXmjSwH280AZ9LlezdBBzFB ZFzihlCzkjzK38eS99xOa5YXp2uUetRrnVEPW32kAOgdEBhz8YLdxhBIZPp4a4nTpoUoqX a13ndRnFbLJpf5ymyiCMU5erZ0G1xexaClQOOvQ+rYCCVzhGaI8nzrBuxLc063XrcCUX2D vkz9feLs0vrx5+cFNI92BsY5rXrL0wFnRzDw/Nd+0PmxCZUlCI3XXTJ2cKYhYYdn6lg7BW Ptg6kg2Z6Fo8OX5dsbw7e66PRU4lyAzljxaOfofVmSmxio5Xku17UCOOLw4YFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3wcF2fmQzpMr for ; Sun, 01 Feb 2026 16:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 411f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Feb 2026 16:46:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 201f968de84d - stable/14 - LinuxKPI: timer KPI *_timer -> timer_* (restore symbols) 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 201f968de84dad8c28bfa5262854608e7001f49d Auto-Submitted: auto-generated Date: Sun, 01 Feb 2026 16:46:05 +0000 Message-Id: <697f834d.411f2.5354a39f@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=201f968de84dad8c28bfa5262854608e7001f49d commit 201f968de84dad8c28bfa5262854608e7001f49d Author: Bjoern A. Zeeb AuthorDate: 2026-01-31 22:43:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-01 16:44:52 +0000 LinuxKPI: timer KPI *_timer -> timer_* (restore symbols) In c84bfaa2531870a023fa9b267a765b9518ed3350 the symbols for the old timer KPI were removed and replaced by inline functions as backup. This breaks kernel modules (such as drm-kmod, though for that there should be a rebuild in the package repo given a __FreeBSD_version bump) as symbols are missing now. Restore the symbols for the stable branch. This is a direct commit for the fix. Reported by: nyan Reviewed by: nyan Fixes: c84bfaa25318 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55027 --- sys/compat/linuxkpi/common/include/linux/timer.h | 14 ++------------ sys/compat/linuxkpi/common/src/linux_compat.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h index 9ab30f3003ac..b1bcbe2756f9 100644 --- a/sys/compat/linuxkpi/common/include/linux/timer.h +++ b/sys/compat/linuxkpi/common/include/linux/timer.h @@ -84,23 +84,13 @@ 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 e5e3d7929759..032a12a427c0 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -2069,6 +2069,18 @@ timer_delete_sync(struct timer_list *timer) return (1); } +int +del_timer(struct timer_list *timer) +{ + return (timer_delete(timer)); +} + +int +del_timer_sync(struct timer_list *timer) +{ + return (timer_delete_sync(timer)); +} + int timer_shutdown_sync(struct timer_list *timer) {