summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-05-25 08:15:54 +0200
committerGitHub <noreply@github.com>2024-05-25 08:15:54 +0200
commite414f623addcb8be826ca0ac8b27976ed08b096c (patch)
tree9e562df139f49844b21a50c161bc94d58aa2ec92
parent869792ab01d9b4caa198dae09dee9cfaabf616a4 (diff)
parentdb1bdb656bcb9206d8f50efce2aed415eb9be5cc (diff)
downloadvyos-build-e414f623addcb8be826ca0ac8b27976ed08b096c.tar.gz
vyos-build-e414f623addcb8be826ca0ac8b27976ed08b096c.zip
Merge pull request #638 from zdc/T6395-circinus
kernel: T6395: Enabled VFIO_NOIOMMU support
-rw-r--r--packages/linux-kernel/arch/arm64/configs/vyos_defconfig2
-rw-r--r--packages/linux-kernel/arch/x86/configs/vyos_defconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
index a6686090..019d0283 100644
--- a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
@@ -5319,7 +5319,7 @@ CONFIG_VFIO=m
CONFIG_VFIO_GROUP=y
CONFIG_VFIO_CONTAINER=y
CONFIG_VFIO_IOMMU_TYPE1=m
-# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_NOIOMMU=y
CONFIG_VFIO_VIRQFD=y
#
diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
index dce06ec8..02af06ee 100644
--- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
@@ -4982,7 +4982,7 @@ CONFIG_VFIO=m
CONFIG_VFIO_GROUP=y
CONFIG_VFIO_CONTAINER=y
CONFIG_VFIO_IOMMU_TYPE1=m
-# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_NOIOMMU=y
CONFIG_VFIO_VIRQFD=y
#