git: a783b0bca2ca - stable/15 - acpi_apm: Don't recurse on ACPI_LOCK in apmreadfilt

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Fri, 24 Apr 2026 17:56:29 UTC
The branch stable/15 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=a783b0bca2ca79e9f881538314347c5304edd11f

commit a783b0bca2ca79e9f881538314347c5304edd11f
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2026-04-14 13:25:37 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
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 <r772577952@gmail.com>
    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);
 }