Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Feb 2025 20:48:04 GMT
From:      =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= <dumbbell@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: dec2806f9681 - main - linuxkpi: Define `PCI_IRQ_LEGACY` for Linux < 6.10
Message-ID:  <202502192048.51JKm4Tr072040@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <dumbbell@FreeBSD.org>
AuthorDate: 2025-02-05 18:11:32 +0000
Commit:     Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502192048.51JKm4Tr072040>