[azure][PATCH 09/20] UBUNTU: [Config] azure: CONFIG_MEMORY_HOTPLUG=n

[Marcelo Henrique Cerri]

BugLink: http://bugs.launchpad.net/bugs/1710261

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 debian.azure/abi/4.11.0-1005.5/amd64/azure.modules |  1 -
 debian.azure/config/config.common.ubuntu           | 16 ++--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/debian.azure/abi/4.11.0-1005.5/amd64/azure.modules b/debian.azure/abi/4.11.0-1005.5/amd64/azure.modules
index ac71fd0319ca..4cb08c7829d9 100644
--- a/debian.azure/abi/4.11.0-1005.5/amd64/azure.modules
+++ b/debian.azure/abi/4.11.0-1005.5/amd64/azure.modules
@@ -398,7 +398,6 @@ mdio
 megaraid_mbox
 megaraid_mm
 megaraid_sas
-memory-notifier-error-inject
 michael_mic
 mii
 mip6
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index a32fb2f4c97a..6e6ada9bd1e8 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -65,7 +65,6 @@ CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
-# CONFIG_ACPI_HOTPLUG_MEMORY is not set
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 # CONFIG_ACPI_NFIT is not set
@@ -151,7 +150,6 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -174,7 +172,6 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
@@ -968,7 +965,6 @@ CONFIG_DEFAULT_SECURITY_APPARMOR=y
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
 # CONFIG_DELL_LAPTOP is not set
@@ -1347,7 +1343,6 @@ CONFIG_FSCACHE_STATS=y
 # CONFIG_FSI is not set
 CONFIG_FSNOTIFY=y
 CONFIG_FS_DAX=y
-CONFIG_FS_DAX_PMD=y
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
@@ -1459,7 +1454,7 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
-CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_HAVE_CC_STACKPROTECTOR=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
@@ -2354,12 +2349,8 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMORY=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_MEMORY_FAILURE=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
+# CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_MEMORY_ISOLATION=y
-CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
 # CONFIG_MEMSTICK is not set
 CONFIG_MEMTEST=y
 CONFIG_MEM_SOFT_DIRTY=y
@@ -3038,8 +3029,6 @@ CONFIG_NUMA=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NVDIMM_DAX=y
-CONFIG_NVDIMM_PFN=y
 # CONFIG_NVM is not set
 CONFIG_NVMEM=m
 CONFIG_NVME_CORE=m
@@ -4435,7 +4424,6 @@ CONFIG_ZIIRAVE_WATCHDOG=m
 CONFIG_ZISOFS=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DEVICE=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
 CONFIG_ZPOOL=y
-- 
2.7.4