From nobody Tue Nov 19 14:31:21 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 4Xt6PP57wRz5f5LY; Tue, 19 Nov 2024 14:31:21 +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 4Xt6PP3Pk9z42lx; Tue, 19 Nov 2024 14:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732026681; 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=zkScUdjlDNAjs1171B6J1LTRyqboE2ommXm8OOIK87I=; b=OUDLNlKNFL0Yk02BLSNARWzKqx+pfaONGooPjTpcZ7o+v3uV5Mp31GSJsQ3Xg3S/hy3okh rZcEbXF1Rdpv/Ka0T5Zfa2sqhUAavUobQDWs3z4Mr9kTrnwQefWoQE+bngMTVMiAqcMn6z LULYrM+d4ZhLgxQCEkX2je3xuIPKRLuvIoOqkqn8INxuUCdLnkUxORGeqkb3O0bu0HKBo4 u5DETO94EnBiVotXRVzXvRvmSe/nzQHQEju2n127lyNvLkUW/nos9Ol40hM37DEiQzZilI GgCeimxXYjIE2xV01kj0iFGXCkQCtDbR9riFtGdWIv6LVcmMR1KqvrXLVumxAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732026681; 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=zkScUdjlDNAjs1171B6J1LTRyqboE2ommXm8OOIK87I=; b=ICm5wLnP3AOqeRzC4MDpmKoRDm+rmqxvHUe8rtSzezSvpfDEkwzxqX3oQOlrpWOjhhuLtT cnx7qKvGrvm1ZB5d0HiL7MZ+v5g5Xn6uCdsFVzpLvO+wUTlC1kerS26HGGSt105J0EjI6R OsBBU5XL542ISBHGw0+G+/z6htOM5fFRRqRiGxH8nfTz44fHBzq3/+/klAgDEaiU0Rsnng rSmvCftxKKKd4E5+YFgDyp1IEKHUPUEBrYgf32zEJtUm9hl1eohfhkZKanb14qqiSMshUl qvUfZgT3GT2QbpqbGIqAts+fUZmJLVmCyGXWe9H4enaAA40D/Vvyvi0uBj5giA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732026681; a=rsa-sha256; cv=none; b=cZexN2BXZdjcbWU6imyff/hQ8ZcWoEObabbHKZgB5oO+dFGdhxNEOvzv2n/NdDi9wlubn4 n7iLmE/0UjdTj7PhZgulPDxRR2hxTXdDHJmHk/wG+wL13LoRG6H+S2qBp2nKaK1xyhHxK8 BUU5meBzV3RbFBL7HNjjpCMYGkkia8iLJKn7UGcsR3jO1+Aub3QCn2X7oUK+XTMwOxUsYe LAr+suOxgjg2CqporV6o+BxoU8B/qLm8rRMnD9E4byQo0XGAUt5dZR8hkJ5vQ/xu70CrPm 9SUs6uHKymE/RRi6GkCF7DSH4YKN7BJPHTMUwTSLozBExThwzretG/yX4csqMQ== 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 4Xt6PP31Sgz1Rq6; Tue, 19 Nov 2024 14:31:21 +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 4AJEVLg9040935; Tue, 19 Nov 2024 14:31:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJEVLsT040932; Tue, 19 Nov 2024 14:31:21 GMT (envelope-from git) Date: Tue, 19 Nov 2024 14:31:21 GMT Message-Id: <202411191431.4AJEVLsT040932@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: b9f9be5d92a3 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: b9f9be5d92a345a52e1dedffb5fdd2e7b6bbc2e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b9f9be5d92a345a52e1dedffb5fdd2e7b6bbc2e2 commit b9f9be5d92a345a52e1dedffb5fdd2e7b6bbc2e2 Author: Mark Johnston AuthorDate: 2024-11-12 01:57:24 +0000 Commit: Mark Johnston CommitDate: 2024-11-19 14:15:07 +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 bbbf753e3df0..ef921df3b64e 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)