From nobody Thu Jul 23 10:00:58 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 4h5RTR3Hmrz6lVvg for ; Thu, 23 Jul 2026 10:00:59 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h5RTR12bBz3WHS for ; Thu, 23 Jul 2026 10:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800859; 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=cjmBPXPyvwpM7cgUZUhfAyRl/C9opZGR1MRdh/4hjAE=; b=vtuxTuTeRQMUZunlcK/XKXJbXB/uq45oGMejdLbx9+5tQMyWd5e25fkoRtqGzDPpl5M+HZ 3jWNVBvsfSUYUv14DJialJOP/XXLxqWfQUvgJa4DmaG2jtCXDNhJK3rcCo6rJl6//Ih1WV /9qqofYEMgXgboOVIHtXaXWvW7vcb0e4o5JZjsEeOk2XBLLj4k7kh4JHiUCT2bj6ygvuNG XnnpPkenom+6x4hMkabfDVrP7janAizGUHiejj+GlhKOHf7W9zI8Bk9gG5NdPoTztUFKfo mbTCYPBUAAdPPooWbezM8NiKIWSWFHlp1OxRCFVfYIFOwpPNXI+C9rz2n1HrlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784800859; a=rsa-sha256; cv=none; b=lnreqWPgiV+4QcXyUp1VRyzGWQG09PDUFeOs6GBbZbE6pvlw/ZeyxhUDVc/aN5TGo8z/b8 iiaFOx00k/gPHXLeSbkPgXv962LoxzPPgZnXfQ72mb4Qt8WKXbF4onI8Zg8j6RFp37xMMA rr8I9VB0ezelc0NeFcYsfdxOJDwuyyAkUUs1h8D89rC8TPEHi1RZnl+Tlf0VK+yam2inNc bNhlU4GLR17lLpNHSOylldKw3he7arnP1tdeF4/JGcRvQ3iGpDgz7InZLgBJq+DMmbEbXU 14qfJUU92ISKga557m+KbSt/CqCDXNKPpUYDK3uiRkllexEHbUix9s7os+UXgA== 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=1784800859; 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=cjmBPXPyvwpM7cgUZUhfAyRl/C9opZGR1MRdh/4hjAE=; b=v8rQUkE+8xSe1T2N1nO/+qMQjwmkpAzJzp+/YLFjoQMk08fiP91B4FvK5TGZ0v3KfkUw3M ZjSNTWTCnvz21FvCA1RGip/HHH2DWhiPHavPSbEgonXQCXOikKTbjTfWzSI4QwsvD3OiVX p9hyvYhOJzk/27LLkTosaHHvXf9oXgZNcwoML5uPIhuLvnQC0qh0jktKwbzu3PbgzfulAS uMsswjpJVzND+nhaY5XB52fTxRkRH9/aKPXMZ+11LjRTdoEafGOCMqWegpzEN4nZRkgXFW P8uheqAt9GmgWssqk1qJjm/LTUaW2hRIsFk2OJ2M06z196FufWwZePhkcHZn1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5RTR01G6z10sn for ; Thu, 23 Jul 2026 10:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d437 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Jul 2026 10:00:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 16bab3443331 - stable/14 - acpi: Suffix acpi_sleep_enable() with '_locked' 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 16bab344333183f1578c77b046295ee8df5fcf35 Auto-Submitted: auto-generated Date: Thu, 23 Jul 2026 10:00:58 +0000 Message-Id: <6a61e65a.3d437.65ad6ac6@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=16bab344333183f1578c77b046295ee8df5fcf35 commit 16bab344333183f1578c77b046295ee8df5fcf35 Author: Olivier Certner AuthorDate: 2026-06-04 07:10:29 +0000 Commit: Olivier Certner CommitDate: 2026-07-23 09:59:10 +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 bf8d2d59c83a..4b5d809ad277 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); @@ -744,7 +744,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; @@ -3315,7 +3315,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;