From nobody Fri Feb 16 20:10:17 2024 X-Original-To: dev-commits-src-main@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 4Tc32L09CVz56WD4; Fri, 16 Feb 2024 20:10:18 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tc32K6N9Jz4K0G; Fri, 16 Feb 2024 20:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708114217; 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=gNOAzD9IFpw6NU05nLlQLOE388BBNjOcyCsZNS+YB84=; b=hoEL1mgUJmwus38omkqxhSkvo1ky3Bv6lTmzjLtQxSd4zsSYiu7hpbOkJC902litHtC29M fD0mPR7SxAdmorr+L0U06Fpkz7o06skgXkA+sONizQJiGRcRZos9K+AGUtpGDAleYr5B37 SWGcmUUnF7lTDCve8P+LkOWCkCZ422oakr2EX6U0265Z/4M6iHJGsKsxc0aQg3h4t3HpF2 GbE5/zC0p5t0hebaijMn323psH4oFfvL39ISMc8cl3n0V/vcs/q0+ClQqdLIi9ipTG2lUm PL/OOMfLNVAVMry9isU7DSG0H8oYBNFM3aKaIfqSnn5yPRb9FQjeFpjEcqoCkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708114217; 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=gNOAzD9IFpw6NU05nLlQLOE388BBNjOcyCsZNS+YB84=; b=PNlcTyBvQmLrEMi/o3Ftw5yzNRHHSngOoEFspWLk9KA59PWJRarhsX6YMUJQst/WyNLDAw Vjf6+LjwWHY8j392f6x68OPeNP0ooIa1MXsnmYhpIIZIWckoKwBtyOdzoSXc58CRbE2fiO L5aWccXt63ZPOScdVsXhMLy5DgpkTahF+g/siRyfvrCGxwW3DpW7//sFRru6S4id7DYgPH B88z2yaLOTzWg7KBLdNdnh9K5VfxZMdR9bKejDRgfIhHJDW10pMIsmx+BwMHVzgUnHxw9B Q1fsybZqh4/jDh9itjQhMx0ratGUxO93qMEOlTilQeJNMbD4eSlON5MzJxL8Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708114217; a=rsa-sha256; cv=none; b=Bo+jzHayxg/L3BVeLtLx2YApQ+oR0DwDeI6SjOTLrmx9ByigLqdWDzO6MZIk9N8aSfhqlO tbjm3CEJdgU42Z6dQoALhPolw8TPms9lezzsRxyBspZPKNSKlZ/igkev67OcGpcAzF+YGf 9cUQ7FlrUbWQxC/sESgWi1seQsSm0Q+crPp3K5NvLTEvznWGWQBij0v9pQK1jSa/Q/9Hid ghgMWjz4HwrwamLIXySTDPdKPKTjtLvR4UG0anMXrGRLZW9jEGlBsXa72z+Zi6IDAEcX/l UzCx3Kmc7b8aE/MzNKC2iqhyOyrUg2BkYYuNPTFUYftTNVjax2fATw77DHCSUw== 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 4Tc32K5R3Mzf29; Fri, 16 Feb 2024 20:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41GKAH5C054868; Fri, 16 Feb 2024 20:10:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GKAHMd054864; Fri, 16 Feb 2024 20:10:17 GMT (envelope-from git) Date: Fri, 16 Feb 2024 20:10:17 GMT Message-Id: <202402162010.41GKAHMd054864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 66d37dbedfbf - main - pci_host_generic: Fix build without PCI_RES_BUS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org 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/main X-Git-Reftype: branch X-Git-Commit: 66d37dbedfbf2dc94ccf49e6983c3652d5909b91 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=66d37dbedfbf2dc94ccf49e6983c3652d5909b91 commit 66d37dbedfbf2dc94ccf49e6983c3652d5909b91 Author: John Baldwin AuthorDate: 2024-02-16 20:09:46 +0000 Commit: John Baldwin CommitDate: 2024-02-16 20:09:46 +0000 pci_host_generic: Fix build without PCI_RES_BUS Fixes: d79b6b8ec267 pci_host_generic: Don't rewrite resource start address for translation --- sys/dev/pci/pci_host_generic.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 386b8411d29a..520462972a66 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -537,10 +537,14 @@ struct resource * pci_host_generic_core_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct generic_pcie_core_softc *sc; +#endif struct resource *res; +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) sc = device_get_softc(dev); +#endif switch (type) { #if defined(NEW_PCIB) && defined(PCI_RES_BUS)