Date: Tue, 14 Apr 2026 13:25:46 +0000 From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 8c941e313e39 - main - acpi_apm: Don't recurse on ACPI_LOCK in apmreadfilt Message-ID: <69de405a.41d83.310c267d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8c941e313e3925b17e49b093244c159db7a112f8 commit 8c941e313e3925b17e49b093244c159db7a112f8 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2026-04-14 13:25:37 +0000 Commit: John Baldwin <jhb@FreeBSD.org> 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 <r772577952@gmail.com> 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); }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69de405a.41d83.310c267d>