Date: Fri, 24 Jul 2026 04:34:56 +0000 From: Olivier Certner <olce@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 13db1010fd22 - stable/15 - acpi: Suffix acpi_sleep_enable() with '_locked' Message-ID: <6a62eb70.3ac73.60978b40@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=13db1010fd22e6a444efe19852d56546a3379326 commit 13db1010fd22e6a444efe19852d56546a3379326 Author: Olivier Certner <olce@FreeBSD.org> AuthorDate: 2026-06-04 07:10:29 +0000 Commit: Olivier Certner <olce@FreeBSD.org> CommitDate: 2026-07-24 04:33:33 +0000 acpi: Suffix acpi_sleep_enable() with '_locked' For clarification. This function assumes that the acpi mutex is held, contrary to acpi_sleep_disable(). No functional change (intended). Reviewed by: obiwac Event: Halifax Hackathon 202606 Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/OlCe2/freebsd-src/pull/8 (cherry picked from commit 3b3911aaf834824f2de0db9fc7d0b9e2b3c089b4) --- sys/dev/acpica/acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index edaa2153b0c9..2092e4c2fac8 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -163,7 +163,7 @@ static void acpi_probe_children(device_t bus); static void acpi_probe_order(ACPI_HANDLE handle, int *order); static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); -static void acpi_sleep_enable(void *arg); +static void acpi_sleep_enable_locked(void *arg); static ACPI_STATUS acpi_sleep_disable(struct acpi_softc *sc); static ACPI_STATUS acpi_EnterSleepState(struct acpi_softc *sc, int state); static void acpi_shutdown_final(void *arg, int howto); @@ -742,7 +742,7 @@ acpi_attach(device_t dev) /* Allow sleep request after a while. */ callout_init_mtx(&acpi_sleep_timer, &acpi_mutex, 0); callout_reset(&acpi_sleep_timer, hz * ACPI_MINIMUM_AWAKETIME, - acpi_sleep_enable, sc); + acpi_sleep_enable_locked, sc); error = 0; @@ -3307,7 +3307,7 @@ acpi_AckSleepState(struct apm_clone_data *clone, int error) } static void -acpi_sleep_enable(void *arg) +acpi_sleep_enable_locked(void *arg) { struct acpi_softc *sc = (struct acpi_softc *)arg;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a62eb70.3ac73.60978b40>