From nobody Tue Apr 14 13:25:46 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 4fw4lt5Bp5z6YZHK for ; Tue, 14 Apr 2026 13:25:46 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fw4lt4cvdz3wjb for ; Tue, 14 Apr 2026 13:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776173146; 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=v8Nll50Et+HnMH/dwUBFsIhrOHWqLl0x9QLlKJtApzg=; b=jiKMJehoI4Bh9G6YtNR2VEWXOqU6hO6A/wV3zZPhJdgL1I8dW9/4J3Ya01HE/FI/fa29g3 VyEJ9x3SWokCQn3qkPqRJCUA4phiuFTR4BkSThX0QTnrxGEVVuooia3CuuaAADh2R954DO QC9cGKdt7ePOyahmF0KQJ6vN4V3O+bNhuj7/32USyiVuE9eZyG2GviNo7Z9VLRzPyD3Xvb qhWzpU6b4IAN/Nb3OwMe3cZO9Dc1K8IsV/oFvozK0qRy2S7QrLJTth76AttCi5fVPTD91a HlPJu4RXIPgTlCdQtWj5H+lyecD6CMOsj/lrR6MjPV8hdMDHFs1wOUkYhaMXeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776173146; a=rsa-sha256; cv=none; b=F6DVrnjGJ3m0FJixPTvOhrGJoU0TlVLrgiNCpKFL9AU23BjxQd0sCS1u3SVno2C4TAqBvq h6x+M9WVxcnPXMd7MHF0RG3LxvU4e+ol+AvvDb6tr4NzpvcyjBhiCx3eJO+GDgIn46bhnE 8C/w1aSsjWugJ18k2cmfBGFgE0hYYJR2RUV6V618Zp+fzrux3Rz9Xa0B4+JmppaQeowbTQ 9t6goNpiQMQvxQpXmT53+tycnd0Gc7OENiEbDb8ltJU8X0US/pBKsHtrFCos08MZqaCPnu jQYz7ZcZ/FMQ1jCHGQMYXLeCt854lfljMRa53s85nC/vYgwULuKdjtp0k2A+dA== 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=1776173146; 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=v8Nll50Et+HnMH/dwUBFsIhrOHWqLl0x9QLlKJtApzg=; b=lK1v30sMDINMncewwUMB+aXZVuDbyuIY6uSuQWSuIjY3pESM/0v3PhEBPTMJAOSdTqW5qH ZpliDFF0qWgedsuwl/bAVcwjSV5f5WP2MgFyD9kjdk114eOEv8NE17z3Ps/UwXk24YhIy4 tEZ63LsPBY4PaQv/EJSQOPp7AZFpN07EdlFjQQpoS6AmbNDxM7Jdr/OoIyEGJVdCzbMzum LE3IN+jO2htemplGa2+/JSl48Hto05/lLxsBGtY9q8VAX+ktIcspTbYXLRbgQl3qbP4NZk 2LAkUxHRl4CrqIyd5lUbn5r9nisYsEVpgYkAZJNx1iaOK6hX5EacVdzfJ3jZJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw4lt49d8zsbn for ; Tue, 14 Apr 2026 13:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41d83 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 13:25:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8c941e313e39 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8c941e313e3925b17e49b093244c159db7a112f8 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 13:25:46 +0000 Message-Id: <69de405a.41d83.310c267d@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8c941e313e3925b17e49b093244c159db7a112f8 commit 8c941e313e3925b17e49b093244c159db7a112f8 Author: John Baldwin AuthorDate: 2026-04-14 13:25:37 +0000 Commit: John Baldwin CommitDate: 2026-04-14 13:25:37 +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") --- 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 71e2573d5fde..e9db0c090f5c 100644 --- a/sys/x86/acpica/acpi_apm.c +++ b/sys/x86/acpica/acpi_apm.c @@ -430,9 +430,7 @@ apmreadfilt(struct knote *kn, long hint) int sleeping; clone = kn->kn_hook; - ACPI_LOCK(acpi); sleeping = clone->acpi_sc->acpi_next_stype != POWER_STYPE_AWAKE; - ACPI_UNLOCK(acpi); return (sleeping); }