diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig
index 74f8009b737f..827a48c87bf8 100644
--- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig
+++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig
@@ -76,6 +76,9 @@ CONFIG_MODULE_SIG=y
 CONFIG_KSM=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CMA_DIRECT_UTILIZATION=y
+CONFIG_CMA_PCP_LISTS=y
+CONFIG_ZSMALLOC=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -116,6 +119,7 @@ CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_BRCMSTB_GISB_ARB=y
 CONFIG_SIMPLE_PM_BUS=y
 CONFIG_VEXPRESS_CONFIG=y
+CONFIG_ZRAM=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=y
diff --git a/mm/Kconfig b/mm/Kconfig
index 2c5a3693e769..a8baf1da33fc 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -179,7 +179,6 @@ config MEMORY_HOTPLUG_MOVABLE_NODE
         bool "Add hot-added memory blocks to ZONE_MOVABLE type"
         default n
         depends on MEMORY_HOTPLUG
-        depends on QCOM_MEM_OFFLINE
         help
 	  When onlining memory blocks, this option helps to add the target
 	  memory block to ZONE_MOVABLE zone type. For successful offlining,
@@ -532,7 +531,7 @@ config CMA_AREAS
 
 config CMA_DIRECT_UTILIZATION
 	bool "Allow clients to directly use CMA for page allocations"
-	depends on CMA && QGKI
+	depends on CMA
 	help
 	  CMA pages are currently used as a fallback for moveable page
 	  allocations only when all regular moveable pages have been
@@ -549,7 +548,7 @@ config CMA_DIRECT_UTILIZATION
 
 config CMA_PCP_LISTS
 	bool "Create PCP lists for CMA memory"
-	depends on CMA && CMA_DIRECT_UTILIZATION && QGKI
+	depends on CMA && CMA_DIRECT_UTILIZATION
 	help
 	  Improve memory utilization by creating PCP lists that contain CMA
 	  pages to satisfy order-0 allocations when appropriate. Increased