From nobody Fri Jul 24 04:34:56 2026 X-Original-To: dev-commits-src-branches@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 4h5wBn26Ybz6lsNv 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 4h5wBm6v5jz3Ymb 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=1784867697; 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=l023bnGPttH7K2UOteMwUDq3Rrsw5Fa+F4RzU5TyJbmijUxcqCBfnv8GPdccgBnW2rjW5f cw0NHc1bY6PWIaXIFgP29PnEnondeaD9AC11fIxIfbfoAUuxwUK7t/fqKbX4nwCfgc2D5N ExkeQehGEbjNPAzNuZlfvepfk2tCQbn93feDxGWtz46GESOuzngOU63qI0qoG6i0v9ojtT ZMSswVGCRrwXT603c5rqO4h2+QMH/Lz/y9U9GuWI/OJPYdp7PCIlIPbxwXz1D/GDnxcCgm 7C5P5dcR9x6KKg03/vfO/O18lvEudSStZfss3DLwWXyFvhCwhAEsYMePH1ftaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784867697; a=rsa-sha256; cv=none; b=PKjyNwNr43BvxMsgBs9ccH5BcPpDxAYlnDZrY6x6KZ1Nsry+0Bu2QzOF9rcrPPdY3cFCxe ZQPqfOPl+qytdp4nKxMtxd285//FZeM3ASGKgqyaj6NZd/A8Ar39RQbLbHWJwzvG5G97DT lGo2axvZMbaEZV6c09c84gOAKAZD7cU0bLnsgBkUNK3Ma7KtCfAMcZcvgwf9HrqpN3I/fE nscH2tG1TJSCFnZN/qinPAT027bZ1NgJnbQbY73ou8YEHrGVl/fQzXzG/E2GvI/YJ13qgN KqoobJ8vp2vrj5IkX8vU/gyurHDmbH053szNbpi/Bry90RXp0IQ7itki9idCXQ== 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=1784867697; 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=L+POVFidMyjSprSLwmCZ5EiYqdVi66+Yafvtlac7t6rjfOFnNVKE21ZJ/y+sPmD0lSMGxE paKqEZU26+If94sEtk1i2eF7oiApWscWtWr9hTmRCnFBnu4gM34V+L5eKyn3r6LEuQ7BZJ DiuDKsn/xSETKbFayX+MaqAhTBGt7SGtsyUOQEU/mxICsFoTBcO+Zlre6xDOLBNZ4egjhv CjSxoeVMNyP39z5Ff5yCj5jVX7d19/4TRUHGJMs8W/8L+Kpx3AeQ5RO7RkoPoMPirAKunJ VRWkaIcfKsnZcNs3mQg19OYiF5ydu+twpJuB/TN9mrAsHPcttVWxxQ9NXSernA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5wBm516pzcPS 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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;