Merge pull request #4586 from mglae/le10_linux_iommu2

linux: leave Intel IOMMU default off for Generic
This commit is contained in:
Matthias Reichl 2020-10-08 00:06:30 +02:00 committed by GitHub
commit 778b229f30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5432,7 +5432,7 @@ CONFIG_AMD_IOMMU_V2=y
CONFIG_DMAR_TABLE=y
CONFIG_INTEL_IOMMU=y
CONFIG_INTEL_IOMMU_SVM=y
CONFIG_INTEL_IOMMU_DEFAULT_ON=y
# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
CONFIG_INTEL_IOMMU_FLOPPY_WA=y
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
CONFIG_IRQ_REMAP=y