From nobody Fri Apr 24 17:56:29 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 4g2LHf1qlHz6ZxhW for ; Fri, 24 Apr 2026 17:56:30 +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 4g2LHd65wqz3ql0 for ; Fri, 24 Apr 2026 17:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053389; 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=VteWk5KjWGDcVSQSCGRHiMIefmrNUTAE6p8uzyXrMhA=; b=jHb6Xo/WD/V2z97TKKzGt15qTklbR/4Hcb3v+ZQxyP7tIq7jFVj1CmhHF92FFGlt8h/Wm8 pVpxaKHJrvj7DyH9kHIW2q+9cXVZmzZGLLsET0KvWeDUovq3A9A8r+mJCm3u+boJn4ii9b Zx7FoxZgrEzKVDuK4GOvP4XPbJx/NgZOJRV8CzdDLOZ9HLpq18QPIQBuKuVWCuXOCwdi6k 1IOG0QfLwDUCQr9PvRNlTMcy+gYR7oYrKXBbtkov43d7d9k54Nv83PdxxiLaW1Z3EtuTnZ 8feMOC8XqZmv2is2HLZCJKvD2fuGXZxj1MrokMb9gYKVpTD5RUbSlX7XqatZKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777053389; a=rsa-sha256; cv=none; b=KsKp0FywYHR1sPTA/K2K/VATJnMDElfgVmnvQiNUUn7jGbpEehOz9O6ixKhhGnrEvtGL/s AbdrSwYTC19Hfh3FYxCMiuHTSjK7XLazduBp8ZzNUe41+xaEvozd1f2gsbdhG+jWNB44tJ wu7Q4p6cYyQCY4ww1SAL5dUONXFoYW/Alya0NYENfIQRoQt107pAB4xh6MYj7oIE1kXmU2 fwKCWHt73gZ+/dAJFY421DQ4xS5NULdptgLfkXk0rN+de01IzGjI8D/RG24Mhjxls7Xowf I8TNRAnkESHktCcCuApl3ZvwZlrWLjKZWyW3gu+BuijREaS0hjKRGj8zOJ8AdA== 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=1777053389; 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=VteWk5KjWGDcVSQSCGRHiMIefmrNUTAE6p8uzyXrMhA=; b=wJzgGvvu1L1z9wkeoSKUyLVAQq6DPncpI41CxU6BG7OZTJ7dxLdd0NF1u5gcTsxNV+HH94 7qwiMxTSoKOHE09XSissklmoyugLp8kCw7rojVmGCbBycOo735v6J7pTnL673ZhPa/EDQ7 DJovsJTQd+QS56yLC3VYbWWawaaDT1TwA3DW7WNn3B62G+opfnMiyxWkZ7GtyktaCFAH2i DyROo/AvpqVlMiEEgfC38aKMbN1ffALP6l+Yp5sr9cUUeyshBKHR41fd5CkVGzltlVwBEi jnySkcQtSgKRUq5jBCA0oGezvtVqlP4K4qVhyEBMETTrsboBcldoWF/tSnkgbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2LHd5Wj8z1C4k for ; Fri, 24 Apr 2026 17:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df90 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 17:56:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a783b0bca2ca - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: a783b0bca2ca79e9f881538314347c5304edd11f Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 17:56:29 +0000 Message-Id: <69ebaecd.1df90.58a55732@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a783b0bca2ca79e9f881538314347c5304edd11f commit a783b0bca2ca79e9f881538314347c5304edd11f Author: John Baldwin AuthorDate: 2026-04-14 13:25:37 +0000 Commit: John Baldwin CommitDate: 2026-04-24 17:49:14 +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 74987ad01d0d..e781085a442f 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); }