From nobody Mon Sep 15 19:11:13 2025 X-Original-To: dev-commits-src-all@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 4cQZPs6kj2z67sTv; Mon, 15 Sep 2025 19:11:13 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPs487Sz4FnP; Mon, 15 Sep 2025 19:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963473; 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=9Q8glrBFEMy5ICMx4ChAhBmD2a7noMLrdvt0QZk9ZJw=; b=IcdxnHJRKmTq/UnxF4pU4Vy9UPjS3cy5yRvhHnavuxj8WW9vBoiJAgMvnX8OxD9gMa7gZd O0rTchWL5qU5RN7gvAjZ/0JbKU2E+zat08UbsQ+/k6421hOiAgvV+65k0wFaMT89Z2fwOY dSNSB2wmiVu9QYSveXHnCpNvXQJlahwiYxmlWH6UI6xX/mrWSXSRGchaIL5HMYwi/WKWG7 FTWXDm/pJaZTwqjEptnXZHKSIGn1INQsGTWyikjXGM2YbDIx4nhFdk/4jz/WvuSs0FVoKO kXierEhRTYOCjr4UfxMlPGc+xImndD2fNe6WhkBCy2cZicrZgjht+g4DzG4cLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963473; 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=9Q8glrBFEMy5ICMx4ChAhBmD2a7noMLrdvt0QZk9ZJw=; b=i6LpPL2o1A8M9bwT9ixEudiqm9F5L3daLhshdCH63QRKND9nq49nPBLZzZzvHJEfCBjT2+ hT0qHuHp6O7vAZIGbqHVxsfZ4MAjlN5iC87NQdYPUP9qNKxhQCVrOTcnVoBdMNlaQgJ4vE UbBYW4D/rrbGzTD75AqtksRkrsF98zF5Q4i7l68b2wIuWuZCpeoewaVU306dJtUbrs/qTm aR0OWEb+N5fYHHlgxrutn11bciYUuxbEJzpb/tiYBCcqKYC6On35PMf91tmuDhYJGAO3Jw Ezyp/BlI+bFdCtkBLnRciHN7GI6mvWiw9KFd2y19xkWrC4UO4XPj27y6C6pVLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963473; a=rsa-sha256; cv=none; b=XcLoj4WgacIlY08YqNN8EMm0BrOXJXus8foIbDaRCMpvXNkwoA8DKv/pRP4BAjEk5PULcj FKTBhdrkdFVzO+ex6lLjUaF1zEy1GEcaxsngyp5vxMwuiDESmjeljqNrJFzHWUYMgUTb4W 3dkaS0ulKHfl/a4XutLbossb+JOY21pSd7mhnIzjcnZlCxBfIpLtyxBB/e//qQh4ieVy8p cO10tQC7qgGciuWNQpkNOQT/Dtc/ZUisTiNjK3jMx9sjoAhaSIGAmph1h3289Ov53oUEcO IKMRpaEAipVBxDrRSJLa8Fm2coVTiSVzf+GGAzcJQ5TV59Ay4dODRQmJZ1qT9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cQZPs3Qb8z16Bx; Mon, 15 Sep 2025 19:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBDmF049852; Mon, 15 Sep 2025 19:11:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBD6w049849; Mon, 15 Sep 2025 19:11:13 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:13 GMT Message-Id: <202509151911.58FJBD6w049849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 88198564dbd8 - stable/15 - LinuxKPI: timer KPI *_timer -> timer_* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/15 X-Git-Reftype: branch X-Git-Commit: 88198564dbd82a97d655e73459c03eccf7031331 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=88198564dbd82a97d655e73459c03eccf7031331 commit 88198564dbd82a97d655e73459c03eccf7031331 Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:24:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:51: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) --- 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 bd06e3158fa3..d48939e28a02 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 *, unsigned long); 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) \ ((unsigned long)(((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 dcdec0dfcc78..458744a9fec6 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -2120,7 +2120,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) @@ -2129,7 +2129,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) @@ -2137,13 +2137,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) {