From nobody Thu Sep 18 09:49:57 2025 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 4cS9pt0rQ9z685h2; Thu, 18 Sep 2025 09:49:58 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS9ps74R2z3wLS; Thu, 18 Sep 2025 09:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758188998; 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=Ifl1Gj6iMdwF+GU3dthrWudt5qReJsw1RmOZdi08F4c=; b=UjOjZaFon5vUU7YPJYvxPsRe4+hBbBkoqesEw5Sn7QpcXFX+s9cdnXk2Yt5VnkX9WR6YZm BXYIz3tqC7lFyDhivScC9yXKaVHT0UaRrzYYp/EjgL17o56Q07IphkNVGOWX2HrRqpfvNk crLDrpDlvznBZ8v8g1h7mkmnEbS63Fy63jXNwcRgLOcjXvk2oj9xNTL9dKvDTGv1qD73Ee XucZ0RmPQ8pRBOPqRh+iyAxQVb80T6I5pF5FShTF+/UmyQ1tAt5+yremRVUmKLuREOPXYv UPVbDGHx+EIMGl5jiZFryqGoSu4g9QxAiZ5U+J8PEnjGLWEq4Wha7D98kqgIZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758188998; 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=Ifl1Gj6iMdwF+GU3dthrWudt5qReJsw1RmOZdi08F4c=; b=jMAypVbnCggNKcclQAFKYutMa8DPwjPQvBw/l8tkgQl2ykQ3yWZ9u9Kz/WrQ1p1Q4zDRx4 vdLwU7y4dv09ohyUPfSCUFYexAtJE/SVyW5AYucm2TJ177h+BDceXt6UGwpZZ/VRjdjlbi 2q1Fci5UGNxhByMvMzbIu0UrCPDEi9xStcjvd/LRXmwbHEISkC7nY8AHczje5Dj1T6Qj8O WG4S1hZttHEHSQYWqoSESSHc52FNTLSTYXlBvXCSTHpDIhP0aiKvVKKa4U+6d8TSrOynxM Ql5FZg5VZAhsRtTq9006HVz9Ew/9SyN6MZ5yVAbZqBrRpiukIah32q+GP+GojQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758188998; a=rsa-sha256; cv=none; b=TbP29n0AdSg8Bw7TF63a9RI8olVuANUyZlB4mpQ9SmrFLY++S/hvhFC1xnrKE3LKSaoTbb 2wo+++Yyezn34Q1RaKPmNW6Lav5tdMXMmTVy/iT3YtWR5BHbIisGGEfsucL0n2DdHFESvw R9F7aPNjQwk/zMGsltxUO5yVP3+eaa+Bxoo8rbv9GKRxmVus/gRzMVjTz2y6ghmXL7mXbS fSbM+syhRFztauGlmc04EaJR//m8QP1ANcQpp+Mun4jlesbAE+glJvMJWVhzAUDF5mlXVu bI0RHnfbnqqE2cF4xFgFQfVzee/nGbRPdplejptDCgiHign/RGfXLo6zKuXoog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cS9ps6Xs2z157N; Thu, 18 Sep 2025 09:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I9nvke017038; Thu, 18 Sep 2025 09:49:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I9nv3d017035; Thu, 18 Sep 2025 09:49:57 GMT (envelope-from git) Date: Thu, 18 Sep 2025 09:49:57 GMT Message-Id: <202509180949.58I9nv3d017035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 25cddb1dfec6 - main - Revert "acpi: Fix build when `ACPI_DEBUG_OUTPUT` defined" 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25cddb1dfec6cfd874961ed08dcc9c76ec533df1 Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=25cddb1dfec6cfd874961ed08dcc9c76ec533df1 commit 25cddb1dfec6cfd874961ed08dcc9c76ec533df1 Author: Aymeric Wibo AuthorDate: 2025-09-18 09:45:12 +0000 Commit: Aymeric Wibo CommitDate: 2025-09-18 09:48:55 +0000 Revert "acpi: Fix build when `ACPI_DEBUG_OUTPUT` defined" This reverts commit 4894f5ba394306a75dbed9ed4377ab0eae75aede. PR: 289634 --- sys/dev/acpica/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 175bfe835e6f..702e1ecb5340 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -3425,7 +3425,7 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) enum acpi_sleep_state slp_state; int sleep_result; - ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, stype); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); if (stype <= POWER_STYPE_AWAKE || stype >= POWER_STYPE_COUNT) return_ACPI_STATUS (AE_BAD_PARAMETER); @@ -3939,7 +3939,7 @@ acpi_system_eventhandler_sleep(void *arg, enum power_stype stype) struct acpi_softc *sc = (struct acpi_softc *)arg; int ret; - ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, stype); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); /* Check if button action is disabled or unknown. */ if (stype == ACPI_STATE_UNKNOWN)