From nobody Fri Jun 09 22:26:28 2023 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 4QdFzm3rjhz4bBHq; Fri, 9 Jun 2023 22:26:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QdFzm3Mvqz3hfS; Fri, 9 Jun 2023 22:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686349588; 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=Khe0unwgGLJvF/4nNzu10SLdzqqAhgUQlgKSnxfetSU=; b=WQl6X+e2BFyIARkdlqgqnyX1wnD7xAMGBTKu6DcOzZUWgsLg2tHrrifMUvDY6rbBNXrLX0 xfP3XxCa+YDILBJ8xPIVN+AXd2+Aihq1d6qo8JZFofLPcECAYVI0wNzVwVcRX7MrlWO3XA qeUfcyUnLCkq4SSuXJatf3vgdg6I8sOYMBDByYRb/OookPme9/Yrp8sw7XzPggspQOvY5W fCq0Vy1bqG+zufu/kT8aQqmJFeWrl6PlYSu2nUgfQXRNjJXweSvyQCs1HQ9eLUwza8D0yl +op6bR/WbOdIJs4oseqopwbiGRz0nDzCOsZvHaX3x4gqKjzFRB7jW8MMiCy2xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686349588; 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=Khe0unwgGLJvF/4nNzu10SLdzqqAhgUQlgKSnxfetSU=; b=hypaXRqfZqZZGQDLGfMxhGy0JvqOcZEO0IzrjhD+um9xH/qmOQChcRvUjgzSsV2OV/3Qp4 EkSum57U2jeyFzImo/dCSPZgNcZ2FKZAthzQVSDENMsgTovrVpF9CFbYrcF4X/dRBnJ/YX 7N1b69bVyzx64BP6393i8nMsbCiH7vX7n3N6KcadlJ9oX91T8lzIFp33ojx0pWSsdnc1CK h/Xntwt2ogXuByZgRLHuthJBqsTzAoCHdUAb9IxlMnFRKAazACdzsTEbitrbQUCYNWTVAE Bf+Nl5C30r3ugP4r/i7AtBjSSOWwiXfx0Z4r51FprEvMcDt6HQ4Sl69m3Q8fEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686349588; a=rsa-sha256; cv=none; b=Ooo8NhFTbjdXsS/0+e28aDDGSh7XpqZlqibaBXCIs6b9VvPOPLhSdggtQVkcS+/0OC/UFF Pa2NCUaVl/OAfp4CJoGn6fr/3AF1XsXQ7BnouQnEbc6X1sLNbEYPEJ1sdX/f2F5fcCyB9v XzqANOIlp2OuCewC/pFSVFZaufrLV+Nu9RkkslBuOKkiJ4SUzil97TMVq7YrvMFFklbesm TrTtJ/vcv1teFC63pSIPxSBzXft+jfDtRbUqlktiAUfdWDPPgGtasvQqF22vGP1Pev0SGs cFmPp1LBe4dl320db7xeltqkAM7EP7+tgeLNWbIbxHJfUE3stVrOt1WQKggEEQ== 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 4QdFzm2Lk1zsW0; Fri, 9 Jun 2023 22:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 359MQSfV019878; Fri, 9 Jun 2023 22:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359MQSQZ019877; Fri, 9 Jun 2023 22:26:28 GMT (envelope-from git) Date: Fri, 9 Jun 2023 22:26:28 GMT Message-Id: <202306092226.359MQSQZ019877@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: 2e07e885d659 - main - LinuxKPI: implement timer_{delete,shutdown}_sync() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2e07e885d65973f13d6111f7e0fcfb848a68082e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2e07e885d65973f13d6111f7e0fcfb848a68082e commit 2e07e885d65973f13d6111f7e0fcfb848a68082e Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 21:02:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-06-09 22:25:33 +0000 LinuxKPI: implement timer_{delete,shutdown}_sync() Implement timer_{delete,shutdown}_sync(), which do not seem to require anything additional to the already existing del_timer_sync(). Sponsored by: The FreeBSD Foundation MFC after: 10 days Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D40124 --- sys/compat/linuxkpi/common/include/linux/timer.h | 2 ++ sys/compat/linuxkpi/common/src/linux_compat.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h index 3432bfc46c4f..7b2f589a3047 100644 --- a/sys/compat/linuxkpi/common/include/linux/timer.h +++ b/sys/compat/linuxkpi/common/include/linux/timer.h @@ -83,6 +83,8 @@ 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_sync(struct timer_list *); +extern int timer_shutdown_sync(struct timer_list *); #define timer_pending(timer) callout_pending(&(timer)->callout) #define round_jiffies(j) \ diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index d639cda64dc9..ffa7193620bc 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -2147,6 +2147,20 @@ 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) +{ + + return (del_timer_sync(timer)); +} + /* greatest common divisor, Euclid equation */ static uint64_t lkpi_gcd_64(uint64_t a, uint64_t b)