[PATCH][focal:linux-azure] UBUNTU: [Config] azure: arm64: CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=n

[Tim Gardner]

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

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.azure/config/amd64/config.common.amd64 | 2 ++
 debian.azure/config/annotations               | 4 ++--
 debian.azure/config/arm64/config.common.arm64 | 2 ++
 debian.azure/config/config.common.ubuntu      | 2 --
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64
index 916808e82b04..f06d90fa3cc1 100644
--- a/debian.azure/config/amd64/config.common.amd64
+++ b/debian.azure/config/amd64/config.common.amd64
@@ -25,5 +25,7 @@ CONFIG_PHYLINK=m
 CONFIG_RPMSG=m
 CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_VFIO_PCI=y
 CONFIG_VFIO_VIRQFD=y
diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 2b15915bccfc..89a1bf4622a6 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -4486,8 +4486,8 @@ CONFIG_TOUCHSCREEN_ZET6223                         policy<{'amd64': '-', 'arm64'
 CONFIG_TOUCHSCREEN_ZFORCE                          policy<{'amd64': '-', 'arm64': '-'}>
 CONFIG_TPL0102                                     policy<{'amd64': '-', 'arm64': '-'}>
 CONFIG_TPS68470_PMIC_OPREGION                      policy<{'amd64': '-', 'arm64': '-'}>
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS                 policy<{'amd64': 'y', 'arm64': 'y'}>
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE                policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS                 policy<{'amd64': 'y', 'arm64': 'n'}> note<LP: #1988434>
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE                policy<{'amd64': 'n', 'arm64': 'y'}> note<LP: #1988434>
 CONFIG_TSL2583                                     policy<{'amd64': '-', 'arm64': '-'}>
 CONFIG_TSL2772                                     policy<{'amd64': '-', 'arm64': '-'}>
 CONFIG_TSL4531                                     policy<{'amd64': '-', 'arm64': '-'}>
diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64
index 35f835e56e7e..7fe2e315476c 100644
--- a/debian.azure/config/arm64/config.common.arm64
+++ b/debian.azure/config/arm64/config.common.arm64
@@ -25,5 +25,7 @@ CONFIG_REFCOUNT_FULL=y
 CONFIG_RPMSG=y
 CONFIG_SCSI_SAS_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index 5337c9462867..998f5b9124f2 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -6469,8 +6469,6 @@ CONFIG_TRACING=y
 CONFIG_TRACING_MAP=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
-- 
2.37.2