From nobody Fri Apr 24 19:54:22 2026 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 4g2Nvf5TRtz6b8Sl for ; Fri, 24 Apr 2026 19:54:22 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2Nvf4dj0z3NFg for ; Fri, 24 Apr 2026 19:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777060462; 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=NBZWtmC1YJM3TGffUteZ4Swh3rGhbtG0nNu4UmWjedw=; b=uV48ODICrxZ4th35FPRZ5cM/r8VtKhb76fM9N7AO4coZJtR8bABkKxuII5HFW4W+lt3Dbh IZgxFG2GGfxbX6xo4jHvgBN35hR09QNIJ2AOiHolH5dc8Qcjerq7bZK/l17L+l+YM3jtYj fImcVNTTaHkgJzDKBNtzxW1l7FnVd+/XfzrpUgwPPmo8SqDL0VhAo4t6MsNSNzA4YJOGFh kyPraB0gbcYhTYPJcmfkAx97a3L0HCz9jHi3QcY1IyPfFsEjd3tf85TDHgOKfrCPjTlcBL KR1QZzffBS76027mPQWOnCb12g70PquX3sHEstbTOusfd/nMh27lkfD8FKrqqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777060462; a=rsa-sha256; cv=none; b=VHP87VcbV1YAYGNeCjkaYhWDFNJ8TlCh+GKOdAYgtTDEbb85/Uuz3UkPfSY32Y+ZKesGWS 94NOn8khJ67Bxm6CpN8hsVB73CwnWr6oEXYLw298vLidv3bJTzc5WddgAlBUzF2rSyi5vq J+NGYyzXsIBarb3oC58r+5rvZR7zc6H7yh4FafQAwGjqjMxXsawkz+ZueOtxKqlujeqTPR EujanTWMqcqnVgQ11YVtX/V+vh+UKN8JnOM9NZAcPVc3QMIdJYukx8zVriyRUf0sYNN4e3 vM7eZQW0NHfjhRgWxmfHR/dN7LVVWscnRIFwmXjjpU74eXXNU75nR1OZssId1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777060462; 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=NBZWtmC1YJM3TGffUteZ4Swh3rGhbtG0nNu4UmWjedw=; b=kqqfM4d/MmotNqSerfEDtYM2m6Jyb7lBJyy6Gqxvk7R6siSPvmSApPkGZyDWYANUFTxM3z UuwR9kXCNg4z8P72kPxvsXcdMKw1/UfjRFDtCsMSNQRTa8AWXqjQYd59ixaKs/VbBGz8l4 1y9gPcxTe9p46cHJzasvsW3xj7udVbEjzM+Sgf+Vl2tHZpuQiIqlI+Imi2OMGtIyDmx74h sou+lwFFQLoNOfKOJ5+q0hB+cMZyNwqbduzcSCyf9veAnXGH0Ls8/AwjP5Q70wI2AfrSGn 49Qt1Si2PBe525kzaAUTQgESxcacnrUKU0zVT5/9u+qFF5s5pTwKloJ++AFeGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2Nvf3yyBz1GKh for ; Fri, 24 Apr 2026 19:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3250c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 19:54:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 363996314872 - stable/14 - acpi_apm: Don't recurse on ACPI_LOCK in apmreadfilt 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3639963148722404e92454ffdd4d795fa636a21e Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 19:54:22 +0000 Message-Id: <69ebca6e.3250c.1f514e6e@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3639963148722404e92454ffdd4d795fa636a21e commit 3639963148722404e92454ffdd4d795fa636a21e Author: John Baldwin AuthorDate: 2026-04-14 13:25:37 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:49:49 +0000 acpi_apm: Don't recurse on ACPI_LOCK in apmreadfilt The lock is already held by the caller since it is used as the knlist lock. PR: 293901 Reported by: Jiaming Zhang Fixes: cc2715cf1f86 ("acpi_apm: Narrow scope of ACPI_LOCK") (cherry picked from commit 8c941e313e3925b17e49b093244c159db7a112f8) --- sys/x86/acpica/acpi_apm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/x86/acpica/acpi_apm.c b/sys/x86/acpica/acpi_apm.c index 7f527af20b41..22bf0cfaef79 100644 --- a/sys/x86/acpica/acpi_apm.c +++ b/sys/x86/acpica/acpi_apm.c @@ -429,9 +429,7 @@ apmreadfilt(struct knote *kn, long hint) int sleeping; clone = kn->kn_hook; - ACPI_LOCK(acpi); sleeping = clone->acpi_sc->acpi_next_sstate ? 1 : 0; - ACPI_UNLOCK(acpi); return (sleeping); }