From nobody Thu Nov 19 15:42:46 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 4jVjQv1h3sz71GM7 for ; Thu, 19 Nov 2026 15:42:47 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVjQt6HdMz3Cc4 for ; Thu, 19 Nov 2026 15:42:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102966; 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=i3Kex5NMh5wPlNDd5r1vPsipZI3NrgEg/ZLoyOYqG/c=; b=PJ4SELkL8niuXHTYEoH+lbVRpERrK6a99DvZ33TKgCbzD6h5/ewmRsya3lzgdxLQgqMG6T zB4SE0p0AA0s0ex10frt+wWHHPt8LNOMEZj260Ksq1vkK/bMCLhxtR6ZCD1dVnh2LNwU6k ZaxM3aNKHyP1n4davQjcK4fGurb3mD41FBcPsw3tUPuVx9opM1seWTDHjYUh0CCkMXh6E0 VH8/0wCtzB173AdOytb/QCpZ1V5akae4MjBMidnTfzC/eJ0uLXRZ0BQ8USyMv8fprb74DK wR6sc9qXCMMR5dGYAUV2g1C+DkjIZkOmv6qk0Tfw6/JySHX4hnn04wOljP841w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795102966; b=yO/DpjrOqG+4WNpaeFfdWifwI0rXAGad704cQkcY5wUje0ie6QY9juHmoO5yxsrkaNGgr1 5oPbWac9DrRrwMqatqI5xKxfunIkKfXFukTMGsQvWo4/HNPfqhrUahE/PTiLW9qElxDjN6 d6XEVuikcr1NAWHvhSdZxLjhmnHQUXbPX1SMdw7HilYJa8N0aXqggEd3csNvp1o0US1Q39 Lqs2KvV2zH8WsZuo32wJqCgKCx0ctaPllqp+3g8upNqtkO5rECRhAI4fsIBxx+nPKKtnPd 1Ein8blHM0dFLqaGd5it/BV1WkWGYCGVsbAJIsAYU+LowpK7nuuvHg3krj/tQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102966; 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=i3Kex5NMh5wPlNDd5r1vPsipZI3NrgEg/ZLoyOYqG/c=; b=u0Jpo6nRNllPBcyPArcdAkFOdoIq26tGzcprh/STeU01xeZD50mEfaBH8Az0q1HGbonfwV oxH9/MkE33RO6v7zYO42roM16v+YcWvUJsKadhv5av+CwpKqAeDc50qeJLIZqGVspWTo/8 cDrZ2hAb9m2zn23D60V1NRdY5XGjcN3ZAcmDk+llMgnDeynbAQShK725JDbBYCGdg549ZY riwA5cCaoPyMN/y0N5PWIXZ9FrhuFBkqJnu96JaddqPSl5Upo1296B4bi1eECMfc8niXUo EEhU6TJWMT62oK3gzSTXE9Yy35B6yv35vehPyOm8KSju0/f1ZG+12zqC/oBmmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jVjQt5bdqz16hx for ; Thu, 19 Nov 2026 15:42:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id df70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 15:42:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0af24d1fe82f - stable/15 - acpi_pci_link: Remove a helper variable from _PRS parsing List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0af24d1fe82f1161cab8f10ba7f23cc3bee7dc11 Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 15:42:46 +0000 Message-Id: <6aff18f6.df70.203ff208@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0af24d1fe82f1161cab8f10ba7f23cc3bee7dc11 commit 0af24d1fe82f1161cab8f10ba7f23cc3bee7dc11 Author: John Baldwin AuthorDate: 2026-11-14 16:02:38 +0000 Commit: John Baldwin CommitDate: 2026-11-19 15:42:20 +0000 acpi_pci_link: Remove a helper variable from _PRS parsing Tested by: cperciva (cherry picked from commit df10f7b7500c129c48a477e94039c4e0d2711b54) --- sys/dev/acpica/acpi_pci_link.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index cb6adee87252..378e4631e97d 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -275,7 +275,7 @@ link_add_prs(ACPI_RESOURCE *res, void *context) struct link *link; UINT8 *irqs = NULL; UINT32 *ext_irqs = NULL; - int i, is_ext_irq = 1; + int i; ACPI_SERIAL_ASSERT(pci_link); req = (struct link_res_request *)context; @@ -299,8 +299,6 @@ link_add_prs(ACPI_RESOURCE *res, void *context) req->in_dpf = DPF_OUTSIDE; break; case ACPI_RESOURCE_TYPE_IRQ: - is_ext_irq = 0; - /* fall through */ case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: /* * Don't parse resources if we are in a DPF set that we are @@ -325,7 +323,7 @@ link_add_prs(ACPI_RESOURCE *res, void *context) * _SRS. */ tmp = &link->l_prs_template; - if (is_ext_irq) { + if (res->Type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) { bcopy(res, tmp, ACPI_RS_SIZE(tmp->Data.ExtendedIrq)); /* @@ -356,7 +354,7 @@ link_add_prs(ACPI_RESOURCE *res, void *context) link->l_irqs = malloc(sizeof(int) * link->l_num_irqs, M_PCI_LINK, M_WAITOK | M_ZERO); for (i = 0; i < link->l_num_irqs; i++) { - if (is_ext_irq) { + if (ext_irqs != NULL) { link->l_irqs[i] = ext_irqs[i]; if (ext_irqs[i] >= NUM_ISA_INTERRUPTS) link->l_isa_irq = false;