From nobody Fri Jul 24 04:34:56 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 4h5wBn26XDz6lsR1 for ; Fri, 24 Jul 2026 04:34:57 +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 4h5wBm6PGXz3Z91 for ; Fri, 24 Jul 2026 04:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784867696; 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=0/IxLotkL6wx7OElAkh/8koCF0TWjuzinRK2msgLEeI=; b=Z6f1zG2wl86Yjq6ZnOf8+LHE8EhozIKS4FkNq1vRIqwFEbrvOAj6WuskQdWZgbDfJ4Zg8O 7nS661Qwni6EsIHVbi4REIrDJUEJvl8L5J0Kc097nFgxcJ4JbhNz6IbLskVhE6rPL2nA3q GpOvRJuY2HStTtkKOzFJMQF4JctQSrzjfOgwiXYlpcttnu/CWgpGmCxJAcOc1QhbmPQO3h N9PiI1Wf8wg3zNFQIhiwkILIKeyCgVu7uy51PKDZgTjeLPXXtBlnjuJxVILFK9GbGgWsC7 /e5lWzoYtAA9j4FeEmtFIb+4tW6c3Ct9t0GnVMHvzDCpViyBZRd2Z9FAjno5+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784867696; a=rsa-sha256; cv=none; b=ozAWPZdwY3weJOyWkl0dtPyxdBdC3n9RWqsGDk3KSehqePoinTxxw5u+k83tFXRc3zgzgb +u7hO5J8/besyI6fJ0TJgONq2Ao1Eq4Q2IVgCaJtoT4C808EUXNrgLLmGz1jGjOveGAZVQ aoYMeKTNvISLO3tqAydF/9S6hTs8x2X1ra2ZoXcnMtbsuyS1D4uR4zZzZxnfyBPX2sK5y6 Kw8DZEwcXJvdiXCI6j4XtvnaFmhM1IxUhBbMfrMJAjk+8Am2K55tZ1TGnGUPMnDkUfOziE 4owTlavGL5a+vb1GGz70iYJJ4l1JY75V/yfAzavPf9Ejh+Kqmrbg6xOgfc2psw== 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=1784867696; 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=0/IxLotkL6wx7OElAkh/8koCF0TWjuzinRK2msgLEeI=; b=c4w0YGrXaaH7cfeHMNA14jcGtRxIqpR7CT+I2V5pW164r/M2h0NMzFjt5Ok0RJSViQMmtj narrTIRZS6QYCrs4Z8VsPQGiRFTKSXPL76t/0ISdWlMhizc2CIf1j3rm3mywWmdGPkAfeh 73yspYIjx4vZQdPu1bMCoWc4bI3zVUPqQGI5TLYvo5x0W6EXx6qHcws2Ip7APCjW1GC8CF 51IDuupPXuhfjoWbSWWLK4TO88ugTz5nA+GUwmoHqyqZrXC2xfgZfUDcF+1TqQ79DMWcD1 haFfvHMytq3P/Z8nA8zKBMVmOUxG3ejc1SVuXrMLrxUNxafpRo+0+s3Ezlj5Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5wBm4z6ZzcTY for ; Fri, 24 Jul 2026 04:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ac73 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 04:34:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 13db1010fd22 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 13db1010fd22e6a444efe19852d56546a3379326 Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 04:34:56 +0000 Message-Id: <6a62eb70.3ac73.60978b40@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=13db1010fd22e6a444efe19852d56546a3379326 commit 13db1010fd22e6a444efe19852d56546a3379326 Author: Olivier Certner AuthorDate: 2026-06-04 07:10:29 +0000 Commit: Olivier Certner 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;