From nobody Thu Nov 19 16:05:03 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 4jVjwc2qy1z71KHP for ; Thu, 19 Nov 2026 16:05:04 +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 4jVjwc0m0fz3MCm for ; Thu, 19 Nov 2026 16:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795104304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZD+q9ieeVwtb3ImFpZ0WnFoxn/QEg5kzcq34V5GUBkE=; b=cHrWClJQOLsYnY+3+URxK/drT4nnquPMgKqluSzmrK6MXcGbOTwZLB0fFhWbpKnxq8oUv1 SosvmkWSQap9LY4OrUr/YaDy5lBHkfN4KQUBiEVqbvaBSeTj6YJsNWmwGtFRnPDAVQjVVR eYMlwEZQOxbqDxHrVtz0JGzQs4wLsVCFpsEGII2A3vX0RWT8RMdY7G+8Y+ZWeSTOoffbul Bu9tcaUADlVF35vwmjPuLqLMHYQO/60MUIh4nL8WYkWh0OaAg5Fh4B3t0iEzJfhn1vKdls dQeXDwEuMXmAXQrNNNVMfHvfHIAlYd6SM3pZTbsLcG+detciKGLqOVKyfgI8Dg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795104304; b=E3RbAx20RPj4XMuR+EpmJOXOEFYFjHe9jL/00uM9RxXc3OLgytCiADBH2tqHNnkzKSZSzm uYdbRBc66UTChWWO1mAscre8UfLLdtyjak2/dHMOMpBTJpOZKZxzEtBF7m+7j3kKIG3zFL 7Vl/ouUm72XOenjRVtMZPSu+afXn2f2F2r+hZ027mAQtnMPLrOb2if3IujDWn9Z+aPNwDZ uxDBWo1cuydMVbqcnNn+HTDnCNdz2V9yz+TDlssSxLJqkdPpz1msSDh0C6dcBUvCezKCWy 14e6tiLOtQJodSRdgist6taAYJwxvKAM2PEZ0b2mEeaFgnIyWH+AJMd1u20zxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795104304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZD+q9ieeVwtb3ImFpZ0WnFoxn/QEg5kzcq34V5GUBkE=; b=wEFSeMchT6f9vuCsv6NV/9vw7lHCBRoLZQtmUkVbTLLDhLYoC2O5eXnVsWhsfqro/cB3ej 5dhQeLJ677+YzzXBoEUzkNiSjZqKQzI8l8kk9SzyKfvZNALBjusXuNbV955oNMy96NeyoM 6mIpO9svGW8cx4aeneUZqudztAQsz5r5cPz3ygWbi0cGLtk0vU88bLDJHBr+gy/C7LC5T0 r7NbWYSGQ06sW0fizIq2yHpOzZH7MbK83b+NXtH4FdRY6mCOeG0MI2Xg90WKe0ypR7uIdm OfDyCX0Iw1UpymU+NpLHdGgOcfRu6pZzLh+V5bGdT8zyygf4M4L5fXTNp1Lgyg== 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 4jVjwb6lRNz170p for ; Thu, 19 Nov 2026 16:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ebde by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 16:05:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Colin Percival Subject: git: e3589b77d084 - releng/15.2 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.2 X-Git-Reftype: branch X-Git-Commit: e3589b77d084cf356bbe39fbc932e322ff840bed Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 16:05:03 +0000 Message-Id: <6aff1e2f.ebde.8becfc9@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e3589b77d084cf356bbe39fbc932e322ff840bed commit e3589b77d084cf356bbe39fbc932e322ff840bed Author: John Baldwin AuthorDate: 2026-11-14 16:02:38 +0000 Commit: Colin Percival CommitDate: 2026-11-19 16:04:44 +0000 acpi_pci_link: Factor out some duplicated code into a single copy Approved by: re (cperciva) Tested by: cperciva (cherry picked from commit 6c1b6f7cf81447315fc0c7a294ed1467c62832bd) (cherry picked from commit b898d97abd96a31c1e26fb15779d35daf7b6ac97) --- 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; } /*