From nobody Mon Jun 26 12:09:02 2023 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 4QqRTV6mxRz4k7Fn; Mon, 26 Jun 2023 12:09:02 +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 4QqRTV5vWZz3kT1; Mon, 26 Jun 2023 12:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781342; 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=jIhfau2LgMNbbsh06q75zKIns9MPKtTR0KrxV/ycN3w=; b=dyYP5nfmnn5vAoJz2hJ+F2+dSmGlsIm1YidVjm/R1mSxqJclkVfX3u3zFtDbM7ZGxkhXLg 9zx1ATNQQ5+4yW4fvALLSjtw0unfeZPWjjeSOoLthiBgj2rUKXWLoJbngzmqJsV9G0hkbt shTskOMdnH3jtpc+5w/d07Ti/m0nCyG9vwiWzc7/MpDgxmAzN+gc+r0SLIGN+LYWp9kwQA mEk1c0EW2ueUAleOi8IZCwwgcvf1/x1HhloyV4AXoWgT82+GZz5w+mKUB6/sLSF3DRMn6J XpzAs6kItCk6mLjcbFNzdeaXQaoCb3PW9EEPbFowbkbXQHYwGt70I0fFlTWD7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781342; 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=jIhfau2LgMNbbsh06q75zKIns9MPKtTR0KrxV/ycN3w=; b=hkqoN2ls5wzz87qOZAalDmSC+3NzNqn0vmwEHHLYQ5vervVJRJJvk+nQ3HAaBcQ5/dRHix bfMt5AVyhQnNUQmyAHv/yYukkxUintDwDGdpb4Lb2kB+Alb8D9+ZZmi9MXvN4RsVrrMnqN eNAzOUenvRqZ3SZ2Ngoex3+CWEB06+w3KGJG7F3NeRidrAY4pbvAZsDe7Y58LNZGeSCKfz gt0/qvSb3/3hOFp5BFjZcKoMgdHOqSE2skBFI5r5J4p3WpTJGOPNKHLQMaIFthifJd8/Py 8gyRmm/3WX9nQkrr4UoU5UM5iNVX1KfYgjZvOGXcfbr4oXSm454E7OJqJIy79w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687781342; a=rsa-sha256; cv=none; b=CjrM99LrgYGi3ZTn3HTOVb7iNA2jRAy6xuYcCertsQo9zlKD926J8IHuRxP2WNKB9vPwpo P5SshNZnGdKJngicdexdBSsNHgVykDLHkJVEmg7BqvpYP3kNwWoQzlK6s9U1SpEqx1Cj+g mat4HVpYWiC6J6FenHGY3WI3qNFQpjAbpyAuxR/O8BukUM9/Lk3B1hG1wjP/8hIA5Wm6fu DoogqC2rkIHemC7HvQPprwUI1Cxih2euBB4uO7lYMt5dc+bN5YLON8LnWZzKuYd5XyYvi6 3bOkU3iav6zt7ti07DqeshNaxM3a2RqWetcbtkLEnDqNrAv9/bKoQAeCUNMQKQ== 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 4QqRTV4xFzz18Lc; Mon, 26 Jun 2023 12:09:02 +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 35QC92TR083593; Mon, 26 Jun 2023 12:09:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QC92cv083592; Mon, 26 Jun 2023 12:09:02 GMT (envelope-from git) Date: Mon, 26 Jun 2023 12:09:02 GMT Message-Id: <202306261209.35QC92cv083592@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: 0dd2a3b488f0 - stable/13 - LinuxKPI: implement timer_{delete,shutdown}_sync() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 0dd2a3b488f00df7871288fa6b85b304a7a40fc5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0dd2a3b488f00df7871288fa6b85b304a7a40fc5 commit 0dd2a3b488f00df7871288fa6b85b304a7a40fc5 Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 21:02:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-06-26 09:25:47 +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 Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D40124 (cherry picked from commit 2e07e885d65973f13d6111f7e0fcfb848a68082e) --- 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 dce3cdcc2de3..a1bf711a421e 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -2148,6 +2148,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)