From nobody Mon Jun 22 21:42:37 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 4gkhWL0Vd4z6j60B for ; Mon, 22 Jun 2026 21:42:38 +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 4gkhWK4vBDz3M9r for ; Mon, 22 Jun 2026 21:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782164557; 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=Gapgmo04uFJISfrEgySYR1JMqUz+Y9TMPIDFRM47eqc=; b=rbNcxbENUGGZ2cT+s0YykeIUn83CYLgHW6N8JccbGHlPCy3SUUOqKpWFWU/WXnMtHAp5Ka eCHWM03luw+DrdUAk8UR7bnjCZiVps4/ZiYP+6PWuKd7KEOhYjUzK5R69zbKue3mtVbBkH jVhC4jOCnMEB7FPMw9a2+0FDCP+GmN8pzqDqm0pg/jd/tqcX29A5bkzOhoniR7aobkUZg9 CDB9VBWYashdXjLZYfy9UlvWVog4caof4ojFcBRIbY5dm32cvdfp/jU38+KB3nQtcRU0Pi 5UWRfT4pcwgp6k9+OzOp8yUeYhZ9ed6X0IossPIf8i3g/LsRNl1y0dCUDpTkpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782164557; a=rsa-sha256; cv=none; b=GeVNrnxNqNKbBlXc7SFYpHY2zU3l1/LONXxYN4j5OmnVHVQKVK7EKsd6e0e3Ma4xz7KPGe p9T5jUcPdEcALLKNtZ7DVYhngQF0ZrBZrh743vdYlE16sd+zQOttjSLRT6L+CANu2f2Ooi rjTloXQkxk/pRIQwr+NHidjINmWGiYEAnzGqU6yqg1VhbWxs3cXCXj8jAK/OdBrZqPZ5Pa uxCFpZ7D9A4ZDLHtgMm7KMqnAibB/wsEbQgyx/JsPY8IB1PQUmcCn7rgrGWCGVvFy0KfSX 09CFmTHoIpW5cbzjma6K5i1p+9WKkej60QV2m7IBn2/IHa4D7uc9crFeZF3L3Q== 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=1782164557; 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=Gapgmo04uFJISfrEgySYR1JMqUz+Y9TMPIDFRM47eqc=; b=CBP9BI9YxSp31uhxoi/CdotD+jDdBWL1Q+6Secpu/KlBY7ZUN6+diCMLoEQh/LfL5g9dtI Sicp3YrAu8hKjHPd8IbKYJmLfZNh0KeEja0GYvJSWxhbm4kqSCCJgjGDpuKjQ49YwHrUD6 5RbkfA/vOh/3FZjeiUXavagZlu3YjUv7TLPQ7gSF5GaMkVBsIwzpEFAJ1qoQw682LVFRnW yOxs/oQ5dCMPlfYfuXI/RkO2cNtsGyZM3QkkAOf0KHCiH7f1OeG8+5vVHk5ZZ2VQ7huLEQ 6RGjjkCz6PK82Bgu1d/5DnkjHNvsGtafLuM1xEqVfE0xywu7pN1moh/lSYuxrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkhWK3SrGz153C for ; Mon, 22 Jun 2026 21:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f6a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 21:42:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 3b3911aaf834 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 3b3911aaf834824f2de0db9fc7d0b9e2b3c089b4 Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 21:42:37 +0000 Message-Id: <6a39ac4d.1f6a8.7719ff9e@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=3b3911aaf834824f2de0db9fc7d0b9e2b3c089b4 commit 3b3911aaf834824f2de0db9fc7d0b9e2b3c089b4 Author: Olivier Certner AuthorDate: 2026-06-04 07:10:29 +0000 Commit: Olivier Certner CommitDate: 2026-06-22 21:40:12 +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 --- 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 9a6dae2dfecf..d599094718f7 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -170,7 +170,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, enum power_stype stype); @@ -801,7 +801,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; @@ -3470,7 +3470,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;