diff mbox series

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

Message ID 20220901135219.25583-3-tim.gardner@canonical.com
State New
Headers show
Series Azure: Set arm64 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=n | expand

Commit Message

Tim Gardner Sept. 1, 2022, 1:52 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1988434

Signed-off-by: Tim Gardner <tim.gardner@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 mbox series

Patch

diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64
index 9329767c8f33..394287604bf9 100644
--- a/debian.azure/config/amd64/config.common.amd64
+++ b/debian.azure/config/amd64/config.common.amd64
@@ -33,6 +33,8 @@  CONFIG_PGTABLE_LEVELS=5
 # CONFIG_SATA_SIL is not set
 # CONFIG_SATA_SIL24 is not set
 CONFIG_SND_HDA_PREALLOC_SIZE=0
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 # CONFIG_USB_CONN_GPIO is not set
 CONFIG_VFIO=y
 CONFIG_VFIO_IOMMU_TYPE1=y
diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 6902e90228e4..15c050c3e052 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -3840,8 +3840,8 @@  CONFIG_TOUCHSCREEN_ZET6223                         policy<{'amd64': '-', 'arm64'
 CONFIG_TOUCHSCREEN_ZFORCE                          policy<{'amd64': '-', 'arm64': '-'}>
 CONFIG_TOUCHSCREEN_ZINITIX                         policy<{'amd64': '-', 'arm64': '-'}>
 CONFIG_TPL0102                                     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_TSL2591                                     policy<{'amd64': '-', 'arm64': '-'}>
 CONFIG_TSL2772                                     policy<{'amd64': '-', 'arm64': '-'}>
diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64
index cee4796697f2..1bbe597a0c98 100644
--- a/debian.azure/config/arm64/config.common.arm64
+++ b/debian.azure/config/arm64/config.common.arm64
@@ -33,6 +33,8 @@  CONFIG_PGTABLE_LEVELS=4
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
 CONFIG_SND_HDA_PREALLOC_SIZE=64
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_USB_CONN_GPIO=m
 CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index c52ac669226a..70768687d3d5 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -7602,8 +7602,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_TRANS_TABLE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y