[PATCH 2/2][SRU][OEM-5.14/OEM-5.17] UBUTNU: [Config] CONFIG_INTEL_IOMMU_DEFAULT_ON=y

[Koba Ko]

BugLink: https://bugs.launchpad.net/bugs/1937295

Signed-off-by: Koba Ko <koba.ko at canonical.com>
---
 debian.oem/config/annotations          | 2 +-
 debian.oem/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.oem/config/annotations b/debian.oem/config/annotations
index 6be9bdcde4d23..32f3f0b08f5f5 100644
--- a/debian.oem/config/annotations
+++ b/debian.oem/config/annotations
@@ -3214,7 +3214,7 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S                  policy<{'arm64': 'n', 'armhf': '
 # Menu: Device Drivers >> IOMMU Hardware Support >> Support for Intel IOMMU using DMA Remapping Devices
 CONFIG_INTEL_IOMMU                              policy<{'amd64': 'y'}>
 CONFIG_INTEL_IOMMU_SVM                          policy<{'amd64': 'y'}>
-CONFIG_INTEL_IOMMU_DEFAULT_ON                   policy<{'amd64': 'n'}>
+CONFIG_INTEL_IOMMU_DEFAULT_ON                   policy<{'amd64': 'y'}>
 CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON     policy<{'amd64': 'n'}>
 #
 CONFIG_INTEL_IOMMU_DEFAULT_ON                   note<the IOMMU can trigger boot failures> flag<REVIEW>
diff --git a/debian.oem/config/config.common.ubuntu b/debian.oem/config/config.common.ubuntu
index 8616ed887be6b..23a6d6eac6ab3 100644
--- a/debian.oem/config/config.common.ubuntu
+++ b/debian.oem/config/config.common.ubuntu
@@ -3518,7 +3518,7 @@ CONFIG_INTEL_IDXD_SVM=y
 CONFIG_INTEL_INT0002_VGPIO=m
 CONFIG_INTEL_IOATDMA=m
 CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_DEFAULT_ON=y
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_SVM=y
-- 
2.25.1