From cde02263b76a88407b23d0ca2e06f244c45dec42 Mon Sep 17 00:00:00 2001
From: Wei Gao <gaowei66@huawei.com>
Date: Thu, 19 Aug 2021 20:13:42 +0800
Subject: [PATCH 5/8] kernel_config: update kernel config 5.10 on aarch64
 platform.

1. Turn on memory hotplug feature.

Signed-off-by: Wei Gao <gaowei66@huawei.com>
---
 docs/kernel_config/micro_vm/kernel_config_5.10_aarch64 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/kernel_config/micro_vm/kernel_config_5.10_aarch64 b/docs/kernel_config/micro_vm/kernel_config_5.10_aarch64
index d9deb7a..bbd016f 100644
--- a/docs/kernel_config/micro_vm/kernel_config_5.10_aarch64
+++ b/docs/kernel_config/micro_vm/kernel_config_5.10_aarch64
@@ -698,7 +698,9 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_FAST_GUP=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
-# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 # CONFIG_COMPACTION is not set
@@ -1767,6 +1769,7 @@ CONFIG_COMMON_CLK=y
 # CONFIG_CLK_QORIQ is not set
 # CONFIG_COMMON_CLK_XGENE is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
+# CONFIG_MCHP_CLK_PFSOC is not set
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -2072,6 +2075,8 @@ CONFIG_INIT_STACK_NONE=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
+
+# CONFIG_SECURITY_BOOT_INIT is not set
 # end of Security options
 
 CONFIG_CRYPTO=y
@@ -2431,4 +2436,4 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_RUNTIME_TESTING_MENU is not set
 # CONFIG_MEMTEST is not set
 # end of Kernel Testing and Coverage
-# end of Kernel hacking
\ No newline at end of file
+# end of Kernel hacking
-- 
2.25.1

