From nobody Wed Feb 19 20:48:04 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 4YypPd2Mb6z5nfgf; Wed, 19 Feb 2025 20:48:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YypPd0v47z3G1B; Wed, 19 Feb 2025 20:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739998085; 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=/ANoFzb+0jmc/GW9DxiHWrfGbnV4LjYYIWCem7pRQeA=; b=NzfvDlcyiARo1RJUeUhCk30MGbx5UXu8gNO+RUZQWuqOooiswtF0ur6DbBg6bL5YgxU/9y U5Vt0ACeUOWr35t9hPzHNsVFGTyn1/wHx8iUS4Xda7iXQ4WlIYQyrFBHSxsV8IPnku6tJf g9UJFTFidP7QS1wNgyYMFlyy2sojoEZTP8PFKZgqCl8tm0ovoVfkHn1uCx3gkq9o5kz+L1 0qzHMpNP57q/ve33y59lCfrBd+mw3YFCoew5rcgHcf9Fr2BONG7/NLyRcRC8uDQ29gUz8Z ri8kA7yEESlDn3GXFnmqrMn1doekK84klpzTdMI0fIi8e/icFPP1lswhuG6qYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739998085; a=rsa-sha256; cv=none; b=DQ8fs0LjgyG+oRPtWuWYoLrw+C6JpHUU9D95LqPGp+ikZUfR/ZITrDXR34vP1Qh3mvjmWS Hu7N8CZeLDAOF7/7qNQA8AbcmrvgpLRO5cIfFiWMHvyBq452BaSln+6mzr9gNPXl3ghcGO 8hzQYH/kysA1TuPyqk75C1eBTq+YcM9c1NsY8i42aETQwJRQgsFyCwg/JLhh74ZwPFfDsQ UoI9epQ58A2J7iHWiZ6Nxv+t06RMKx4X8lZzrS1xQm3jscu/mayFvY+r2+SOdNU+iBySuh uOPp1ivBGd+JLx0kHh+7AtDxFCSC9gOKrjqgQiVKWa1i8WHU44Y9lSraROso1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739998085; 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=/ANoFzb+0jmc/GW9DxiHWrfGbnV4LjYYIWCem7pRQeA=; b=wSAJKXrAebupwzmi8dyfvKPM5y7NqL8pZNqK3bmqwVQrlP/bfJFDFaRpSu2Pk9fDwrUv/m fHIuN+kEWbrpIjrPYvu6PA3zjGeyfV84b+sikGW93ZbN6AQlWK+Ocg+kTk3qyWQX2/Pey4 smYXS6liu1hiUVQ1ze/xv0ghgE4P8w6rLiKwVfUzvua/6AjMUBcVAElYpOYPkYuH7hHLqt DwVZR+HDcuW1vLcOoVCsgfeIvl577KnIMhBY3w2Jn1JohQKBEc0chMjy8Fv+vBnELJIWPS +7LgQMYMyYKagj0AJ3zI9pq52MYvbrUvqRDKxyRFCswTmpugzyBpH+zmeVZtvQ== 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 4YypPd0PM6z5RB; Wed, 19 Feb 2025 20:48:05 +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 51JKm4Ra072043; Wed, 19 Feb 2025 20:48:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JKm4Tr072040; Wed, 19 Feb 2025 20:48:04 GMT (envelope-from git) Date: Wed, 19 Feb 2025 20:48:04 GMT Message-Id: <202502192048.51JKm4Tr072040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: dec2806f9681 - main - linuxkpi: Define `PCI_IRQ_LEGACY` for Linux < 6.10 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: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dec2806f9681b44937c63f0d875e96d09d38fab5 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=dec2806f9681b44937c63f0d875e96d09d38fab5 commit dec2806f9681b44937c63f0d875e96d09d38fab5 Author: Jean-Sébastien Pédron AuthorDate: 2025-02-05 18:11:32 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-02-19 20:39:46 +0000 linuxkpi: Define `PCI_IRQ_LEGACY` for Linux < 6.10 Commit 03e39d3d42e70482cd6f65ecaa5cf8ff9674d27c decreased the Linux version that exposes this constant to be Linux 6.7. It happens that the constant is older. However, it is removed in Linux 6.10. Let's change the version condition to say that it is defined for any version before 6.10. Reported by: bz Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48861 --- sys/compat/linuxkpi/common/include/linux/pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 64f44812ee3e..b3f89760dac9 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -238,7 +238,7 @@ extern const char *pci_power_names[6]; #define PCI_IRQ_MSIX 0x04 #define PCI_IRQ_ALL_TYPES (PCI_IRQ_MSIX|PCI_IRQ_MSI|PCI_IRQ_INTX) -#if defined(LINUXKPI_VERSION) && (LINUXKPI_VERSION >= 60700) +#if defined(LINUXKPI_VERSION) && (LINUXKPI_VERSION <= 61000) #define PCI_IRQ_LEGACY PCI_IRQ_INTX #endif