From nobody Tue Nov 19 14:31:26 2024 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 4Xt6PV2Hm8z5f5Bd; Tue, 19 Nov 2024 14:31:26 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xt6PV1YJpz439t; Tue, 19 Nov 2024 14:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732026686; 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=NM7RXfE4VuwfOUrwjneeSjhRbtvMnzQleR6r3tCFWZQ=; b=i3Q2O9BxFuOO6VavRE3ArkPe1LbFXYs8y8SdwD0u12gBQaLzub+t8FVyOBLj8m8k0FWsNh V75B8WIVXXsWa82ADAuBtZb2aXrnDGS1z9/C6+0s56oQTPTKo3bZv6MSkXoC9jQ1Fyb2oU lURKr8mD4PoolXaAx3y5iiFvRCcvbC4UN4HRyKhx7Gp67BM0yoev1CF4Ii/dW7mOtmAH22 qed308Oc8kep/yTk3U1TZqMKY3rLygN8Nxf3zrhCXIkzTFXM7btaiHdZK3GSie5zxvw4in V+/L+KQSikAd2KW6jieGO5r58JmzeM1TjhW0xoCYOZmgjILSLPFnxbPjvMfyMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732026686; 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=NM7RXfE4VuwfOUrwjneeSjhRbtvMnzQleR6r3tCFWZQ=; b=sOZjD36OUGFwh6jrd6NF2xoun5A+ley4x0rTWholRG7YxLgTCVW8cwEaove7Jnlfox95xN 8Srlhny+/faKs+86jZhpM3edzf90TA8c6IrlUXkNbMDGn997NTChFzejfIXWEKgw5Fkeyt ikbpMokfjO+LDUuMbwivBkTeHFe3iL8+wy2yNNQApEb50nPKWCe8EiImMzPZ3F3MRRK/dZ Uc84FyXbyQI06GhnMitCnv54SDAxZETJj61hXXajecNsDlvb4Vc1T2qkBi1OsJjf1NBpnC z6JtGmtfGd3PYfs5AdJOf/+4a5SBRGVN8U21yy7ZHvhNelKd9svkrs7Bq4t6Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732026686; a=rsa-sha256; cv=none; b=GuURO6x3lyeRBMeOmQQnJpO31n2ynYjy6PgglT87jfX1umiwndnY9ULQUIcXm4VcvzoWRA hUoa0VCuon0kJCfvbjxgxy5yxvMUQs8VMygDz2Fk9XBcCxMOKQW0j/Qvxd1uQfEuxdY0dV Nw3N8yr7T0kHzXE6O+kHSqaVnMoQQwIaU5ywbVHJ61HT9sZ29g6BTiQC61S9SdFiSndS/q IqfgupTOPU3K+oMulWYiGR6KJIK0dn/r3qQfwVS9YwksUq+6+itEq9ABs20Q3Q7Xbl+QeX e+or6nl630ZQhj1AuJqrqsOCCxg+tgzgPnyZdukQXp3y0xYLMOItfMM7qH1qDA== 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 4Xt6PV17nPzDZt; Tue, 19 Nov 2024 14:31:26 +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 4AJEVQio041155; Tue, 19 Nov 2024 14:31:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJEVQ7c041152; Tue, 19 Nov 2024 14:31:26 GMT (envelope-from git) Date: Tue, 19 Nov 2024 14:31:26 GMT Message-Id: <202411191431.4AJEVQ7c041152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5544391d8724 - stable/13 - sleepqueue: Fix the comment for sleepq_switch() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5544391d872495b5517ac16ce9a46027925efc1a Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5544391d872495b5517ac16ce9a46027925efc1a commit 5544391d872495b5517ac16ce9a46027925efc1a Author: Mark Johnston AuthorDate: 2024-11-12 01:57:24 +0000 Commit: Mark Johnston CommitDate: 2024-11-19 14:15:15 +0000 sleepqueue: Fix the comment for sleepq_switch() The comment from mi_switch() applies here. PR: 279708 Fixes: 686bcb5c14ab ("schedlock 4/4") MFC after: 1 week (cherry picked from commit 1030ee9128373e7819e5d4a45475ad8cda24fec9) --- sys/kern/subr_sleepqueue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c index d5308b1e929a..727e13891f98 100644 --- a/sys/kern/subr_sleepqueue.c +++ b/sys/kern/subr_sleepqueue.c @@ -539,7 +539,8 @@ sleepq_catch_signals(const void *wchan, int pri) /* * Switches to another thread if we are still asleep on a sleep queue. - * Returns with thread lock. + * + * The thread lock is required on entry and is no longer held on return. */ static void sleepq_switch(const void *wchan, int pri)