[PATCH][Hirsute/linux-azure] UBUNTU: [Config] azure: CONFIG_CMA=n

[Tim Gardner]

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

CONFIG_CMA was inadvertantly left enabled during arm64 development.

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

diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64
index f3eec5c79fae..13a10ca0a76a 100644
--- a/debian.azure/config/amd64/config.common.amd64
+++ b/debian.azure/config/amd64/config.common.amd64
@@ -10,7 +10,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 CONFIG_ATA_PIIX=y
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 10.3.0-1ubuntu1) 10.3.0"
-# CONFIG_CMA is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 CONFIG_CRC8=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 55b189bfb5e3..c8cfa4435cec 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -4,6 +4,14 @@
 
 include "../../debian.master/config/annotations"
 
+CONFIG_CMA                                      policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_CMA                                      mark<ENFORCED> note<LP:1956762>
+
+CONFIG_DMA_CMA                                  policy<{'arm64': '-'}>
+CONFIG_DMA_CMA                                  mark<ENFORCED> note<LP#1956762>
+CONFIG_CMA_SIZE_MBYTES                          policy<{'arm64': '-'}>
+CONFIG_CMA_SIZE_MBYTES                          mark<ENFORCED> note<LP#1956762>
+
 CONFIG_MICROSOFT_MANA                           policy<{'amd64': 'y', 'arm64': '-' }>
 CONFIG_MICROSOFT_MANA                           mark<ENFORCED> note<LP:1949357>
 
diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64
index 6f0b14ba3ae3..d00d2bf6798a 100644
--- a/debian.azure/config/arm64/config.common.arm64
+++ b/debian.azure/config/arm64/config.common.arm64
@@ -10,7 +10,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_ATA_PIIX=m
 CONFIG_BROADCOM_PHY=m
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 10.3.0-1ubuntu1) 10.3.0"
-CONFIG_CMA=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 CONFIG_CRC8=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index 398936d29e7b..4883d9b4724e 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -1114,15 +1114,7 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_CLS_U32_MARK=y
 # CONFIG_CLS_U32_PERF is not set
 CONFIG_CLZ_TAB=y
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_SIZE_MBYTES=32
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA is not set
 CONFIG_CMDLINE="\"console=ttyAMA0\""
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
@@ -1746,7 +1738,6 @@ CONFIG_DL2K=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
 CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_HEAPS_CMA=y
 CONFIG_DMABUF_HEAPS_SYSTEM=y
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_SELFTESTS is not set
@@ -1757,7 +1748,6 @@ CONFIG_DMAR_TABLE=y
 CONFIG_DMA_ACPI=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_DMA_BCM2835=y
-CONFIG_DMA_CMA=y
 CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_DMA_DIRECT_REMAP=y
@@ -1768,7 +1758,6 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_OF=y
 CONFIG_DMA_OPS=y
-CONFIG_DMA_PERNUMA_CMA=y
 CONFIG_DMA_REMAP=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_SUN6I=m
-- 
2.34.1