From nobody Fri Jan 16 19:40:56 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 4dt9FN3ckDz6NlZl for ; Fri, 16 Jan 2026 19:40:56 +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 4dt9FN1N4Bz3x9h for ; Fri, 16 Jan 2026 19:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592456; 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=LkkbJSDUfdMuAQqBWTwq03YAlc/AZDxSHqwgLis+6/w=; b=qzOhcrvpcxKZTZngx2O24e2hxNnYaMwQYLETHgvbsH/r02kex72B0GVg32DRIBroz/IcR3 y4hiczUORkOhs3VN0DahrfL4r9kmCsdnoTdM+1+hHvtzy2c80dh17L9NzhWWzF4M4ggMx7 n4w/0/hVAdPLeA/qg3Cf2saTRjTxbUp9Kp4euoULUHjHIZzXtnhBj2356FrsfIeIFmKlDf VTIVvc93QsLS32yu6tb6HUE4zMjaMtOAgi2ETIbZ85nXO4RQbXRIyuLAeBNljRJXMZGvmj Cs6G6LI3mJc3ACh470xGPc25SP8DUXfxCUtcgSeKKKAHkFiIor1C3OSZeZbGtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592456; 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=LkkbJSDUfdMuAQqBWTwq03YAlc/AZDxSHqwgLis+6/w=; b=uyB/pKhY7wE3p5Ar0WnLsLcCRiNFHzhXinsuyV6YTx1VX+BekWY3xEhRVdOi9lJyHd2SRJ f9QAXe5AjThXCooztMElAPJX82kABRJpIr+ON0v565p1FxBVXFOWNhnYaDN0yC7B8mWjqY nPro6muvI94eulwsmVnS0bKda0INUPY4V5DjoQeyEWRi3kqE94BRB+oP/XXjaJFvsLXtdP T8Y5kuaet02pikPaXMVOByXU+CAnuriNrDPCy+zqojP4KGYaDnvEDRijHE78SJ3Fpjtkmk /TQPCpP9N8MkbdJLvsxurgkmYNyi2LFEzY8vlDXKDRz/We1sWDjZf/cLgbNfFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768592456; a=rsa-sha256; cv=none; b=o9v4oDJiKQA+7PHhrdi6kwD3GvrZgXWqzYOqsAsBdCADdysTqacYVQ1AAfM8My2jU6j0I1 5fm0P6rd4RhqxSBP7LAILzkdcNaBkN1gH02v/1scPQkuszwwIA7c1Q9ZHvXZFgMoj+vWiq c96BTaS9wKq+yrcJR2fZZ/B3eMGi4deWXRXx7MMDdngCi0qgYa2GLN/oUlNNG1/bGJQ6/y xremoTamU9Xc4a9C5P23z882Vp76FVMgadCu+QSy2Kq8+u008asYRz4Z8LkT7nuXF423Nt HR7N71IW3RkXC38cslO2Ukurrh3G35bCFQH0zRXKxFPxs+VU+wfL0TOuiIhqLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dt9FN0zt1zC6r for ; Fri, 16 Jan 2026 19:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c84c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 19:40:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c84bfaa25318 - stable/14 - LinuxKPI: timer KPI *_timer -> timer_* 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: c84bfaa2531870a023fa9b267a765b9518ed3350 Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 19:40:56 +0000 Message-Id: <696a9448.c84c.3cbc39d4@gitrepo.freebsd.org> 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) {