From nobody Fri Sep 5 23:29:03 2025 X-Original-To: dev-commits-src-main@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 4cJXbz73qmz66Yhv; Fri, 05 Sep 2025 23:29:03 +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 4cJXbz4d2nz40hd; Fri, 05 Sep 2025 23:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757114943; 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=6LLcYy+mGrf/DC9xFVMsn5f2A+bvQhzGA6Si7BSoOR8=; b=u37XTj6LVtHyNoTVnJE/yxVxdcJL6HSFnCth4dxE3K2f6H5OyEgqVNTnna9JOHKtOFztHL FD7VbmYLs3hAp8kflRBvh70wB2/lwkTzWhZ9KN1g4dp46bzIZ9WfwTqW+/d4hstprw5PfB Q0G1Su2ZDcm9HfSDdAT3PxUarggn5JR2KBfzZ8FO5CxHN+bQtZVUH5OHRUuzMxgGkA4+un PlC7eyUbadJ8qZiFkVYsYu8GFMdiY7QGUms8hRsxhpO2p1tlBpg2CHmJqtMFe6rtUk5J9P RKZsqECn651x2+KXB73HZJJK970dRvWF6fRnMjY2CLnhlsYKcXNcOTBeUyf3+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757114943; 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=6LLcYy+mGrf/DC9xFVMsn5f2A+bvQhzGA6Si7BSoOR8=; b=Iz4XgoA5Gv7nB37C3T2p4oAiLeUj2EGvSIVk0ZGfixCi3zyvRgs4bv3G0t27Cl0tvaHMFZ DKREkHr/wCvgLbo+M2xSO36gfczZcb5HeKY3pAv/Tf9RinI4eru9mKtVUPPxnhI74fEb3d 0Uji8ZpCs3WZWvT8R49BmwqFk+XUWbHSr1KHV7XvsQ4b7iwjCkxIm0VW5L+KIuYNurqhR8 wIzDb14sTE8REbuWnuqoUGTSwzZU46ILNZGyW+b4X4h6EYkXBaYeM+3C90ZW1Yink3faXv TN80yaznKSjknNE1WTE+hb9s6wOvTSf385MQzLcUU+Xk/r/xrBUGEO4aCthZwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757114943; a=rsa-sha256; cv=none; b=Od2EaQCK8xa+dTqsmki0JeReE8xELEcuUlEj2/J6l1vAA7LhTswFkm+YG4fREq69lAV3iI DrXa2kASfD/MzhLIK51i/uswv8EncWS9aVLt2LcFHgkZWo9eoH6fWczMIcgYYiGZlyfABm paT+9YrEIVVHEPfJ/NQbdXBSp1Js0QkV2rC6wCM5R7WKIitWjq6UgMuU2tA8JelKHpTh2Y UsjgfVK89ynOmhHNR5CsuGaiWzFoFVn8HVh9x0VcY0kLeyrHT0RQzH2zKG5ZxvVTJi4cxU 7zd2QuPRKWkekkamoqMeth5MJc61BmQ9n0FrssEOQxiEWJ2YPL3LoffUzMFN9w== 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 4cJXbz3xr9z183b; Fri, 05 Sep 2025 23:29:03 +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 585NT3EL029332; Fri, 5 Sep 2025 23:29:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585NT3Pr029329; Fri, 5 Sep 2025 23:29:03 GMT (envelope-from git) Date: Fri, 5 Sep 2025 23:29:03 GMT Message-Id: <202509052329.585NT3Pr029329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5cb64a1d3fe7 - main - LinuxKPI: timer KPI *_timer -> timer_* List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5cb64a1d3fe75526fb879ef4dce5860bbb4e4aea Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5cb64a1d3fe75526fb879ef4dce5860bbb4e4aea commit 5cb64a1d3fe75526fb879ef4dce5860bbb4e4aea Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:24:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-05 23:24:15 +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) MFC after: 3 days X-MFC; preserve symbols, not inline Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52074 --- 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) {