[openwrt/openwrt] kernel: vfio: flag vfio_virqfd as only kernel 6.2 and earlier

LEDE Commits lede-commits at lists.infradead.org
Wed Apr 3 23:56:21 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/77e03f3c833a51858b16d923e1abcbd82de1e90c

commit 77e03f3c833a51858b16d923e1abcbd82de1e90c
Author: Mathew McBride <matt at traverse.com.au>
AuthorDate: Fri Mar 15 14:16:05 2024 +1100

    kernel: vfio: flag vfio_virqfd as only kernel 6.2 and earlier
    
    Kernel 6.2 folded virqfd (eventd interface for VFIO interrupts)
    into the base vfio module, it is no longer a tristate option.
    
    Change suggested by vincejv on GitHub:
    https://github.com/openwrt/openwrt/pull/14868#issuecomment-1998260124
    
    Signed-off-by: Mathew McBride <matt at traverse.com.au>
---
 package/kernel/linux/modules/virt.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk
index f45cb17614..a408ac9b14 100644
--- a/package/kernel/linux/modules/virt.mk
+++ b/package/kernel/linux/modules/virt.mk
@@ -84,9 +84,9 @@ define KernelPackage/vfio
 	CONFIG_VFIO_MDEV=n
   FILES:= \
 	$(LINUX_DIR)/drivers/vfio/vfio.ko \
-	$(LINUX_DIR)/drivers/vfio/vfio_virqfd.ko \
+	$(LINUX_DIR)/drivers/vfio/vfio_virqfd.ko at lt6.2 \
 	$(LINUX_DIR)/drivers/vfio/vfio_iommu_type1.ko
-  AUTOLOAD:=$(call AutoProbe,vfio vfio_iommu_type1 vfio_virqfd)
+  AUTOLOAD:=$(call AutoProbe,vfio vfio_iommu_type1 +LINUX_6_1:vfio_virqfd)
 endef
 
 define KernelPackage/vfio/description




More information about the lede-commits mailing list