From nobody Thu Nov 19 15:42:47 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 4jVjQw1BP7z71GPP for ; Thu, 19 Nov 2026 15:42:48 +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 4jVjQv6M8jz3CYw for ; Thu, 19 Nov 2026 15:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102967; 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=8aA+H3yv9svT6oOPvCCMgbs7DAzg9kCeqtLDurzl2bk=; b=TlmeYOmyRh55oNej4Yy8h2RoRbgc2oauk5uccLo5uBM5PuCJt8y9pdkAMDNFRKWDSgFEYX 8fuOoQc9EZLOFj+8tOtDYioHlSbdfdFkelTXGqenXEVdWgoJXndUQROvIjWEs0QIKE9/JI Esm+1DXF7PxDJP5xKr26PZ6ZeyFgDJY6JCce5xqRTmvzxj3UDwLknT+PlI+r9kP98Q5adv jo5xWA96fpB3417yEmpx3LJ/Wk3L7RsvzfujOTR5biri7wPnA8JsBq2qIOKyGzxwrW841w jR0L+Guz2dmuyCXxu4jdalSgvZxFrU175WVIlNhDsSCqc9CBRKVozUidGebplw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795102967; b=HQr4HLLKu+c7wJ+4H2I5uiqeYhwfnBt27iqAutYrFxsbfY1ttJw5Dz24ousgfOpO6i+wi6 WXbBRIYNGyL2aEXp8bKpSyeT4yZxOfNc+eAo+ScXG6PB0fL7f8F+qiUf6nKQ9u89yfQgLc vpwHWpYTMgnJ6UHCnE/7ZfNdNrjrcTU/c01AKLuF25korzj0tMCK6tliPUyRag1A/CyFDG 4SXKoVMcsuRKqFdv80+FTtID2iyYaSBXVVmKxfK+KcWh1M153t5t0vZzaQk/4Iqdeqm57C kjEhhyZjpDHwYR5KUT6njHwchSmlR1tKJ+tjeu/JiRFPECBaQG5DD5KjyXCtEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102967; 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=8aA+H3yv9svT6oOPvCCMgbs7DAzg9kCeqtLDurzl2bk=; b=wV9G1EGRSjwuEfZYJ8hr8FL+75KoIygyphDgCnztgplSsGDjELG3cbW51ud7Hbpo7n0tQZ 1dOUs1RX3VWSH2nNWiZVa5gOsItU0H66hOxrYfZdEOVbdNupQO1r6OOsccuHYAQ2Zb42oh +gsZoL4OWshq4ewfPYBKC5Q8patEhUStX/T9QMV7lEQgDUjNDp+cKZYUvIJWO4eSxMxDon ALQYLGnTQEKQRr+tvz03nwKQY4MlVe6cAVIJPvTQ7/y6Y6cImEYPRRI0Ft84BUbId1weiy DmhFaWprP3q7/9pOuhNAGkEiy/QXnSYQNRM48JZbAmck/OeDkzQ9iK4dQolBQA== 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 4jVjQv613Kz16ML for ; Thu, 19 Nov 2026 15:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bbf8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 15:42:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b898d97abd96 - stable/15 - acpi_pci_link: Factor out some duplicated code into a single copy 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: b898d97abd96a31c1e26fb15779d35daf7b6ac97 Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 15:42:47 +0000 Message-Id: <6aff18f7.bbf8.123d2a1@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b898d97abd96a31c1e26fb15779d35daf7b6ac97 commit b898d97abd96a31c1e26fb15779d35daf7b6ac97 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: Factor out some duplicated code into a single copy Tested by: cperciva (cherry picked from commit 6c1b6f7cf81447315fc0c7a294ed1467c62832bd) --- sys/dev/acpica/acpi_pci_link.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index 378e4631e97d..b10f9614c5bc 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -356,13 +356,12 @@ link_add_prs(ACPI_RESOURCE *res, void *context) for (i = 0; i < link->l_num_irqs; i++) { if (ext_irqs != NULL) { link->l_irqs[i] = ext_irqs[i]; - if (ext_irqs[i] >= NUM_ISA_INTERRUPTS) - link->l_isa_irq = false; } else { link->l_irqs[i] = irqs[i]; - if (irqs[i] >= NUM_ISA_INTERRUPTS) - link->l_isa_irq = false; } + + if (link->l_irqs[i] >= NUM_ISA_INTERRUPTS) + link->l_isa_irq = false; } /*