From 47a872580150e85e56be647f5577b7cc7fda02b5 Mon Sep 17 00:00:00 2001 From: Wenli Xie Date: Tue, 19 Feb 2019 14:18:41 +0800 Subject: [PATCH] enable config CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE by default Fixes: #343 Signed-off-by: Wenli Xie --- kernel/configs/arm64_kata_kvm_4.14.x | 2 +- kernel/configs/x86_64_kata_kvm_4.14.x | 2 +- kernel/configs/x86_64_kata_kvm_4.19.x | 2 +- kernel/kata_config_version | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/configs/arm64_kata_kvm_4.14.x b/kernel/configs/arm64_kata_kvm_4.14.x index 8178ddb0b7..bb408498bb 100644 --- a/kernel/configs/arm64_kata_kvm_4.14.x +++ b/kernel/configs/arm64_kata_kvm_4.14.x @@ -510,7 +510,7 @@ CONFIG_NO_BOOTMEM=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTPLUG_SPARSE=y -# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set +CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MEMORY_BALLOON=y # CONFIG_COMPACTION is not set diff --git a/kernel/configs/x86_64_kata_kvm_4.14.x b/kernel/configs/x86_64_kata_kvm_4.14.x index 56d0fd25c5..94661e7cfc 100644 --- a/kernel/configs/x86_64_kata_kvm_4.14.x +++ b/kernel/configs/x86_64_kata_kvm_4.14.x @@ -504,7 +504,7 @@ CONFIG_MEMORY_ISOLATION=y CONFIG_HAVE_BOOTMEM_INFO_NODE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTPLUG_SPARSE=y -# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set +CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y diff --git a/kernel/configs/x86_64_kata_kvm_4.19.x b/kernel/configs/x86_64_kata_kvm_4.19.x index 6df02faea0..02dde38246 100644 --- a/kernel/configs/x86_64_kata_kvm_4.19.x +++ b/kernel/configs/x86_64_kata_kvm_4.19.x @@ -763,7 +763,7 @@ CONFIG_MEMORY_ISOLATION=y CONFIG_HAVE_BOOTMEM_INFO_NODE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTPLUG_SPARSE=y -# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set +CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MEMORY_BALLOON=y diff --git a/kernel/kata_config_version b/kernel/kata_config_version index 64bb6b746d..e85087affd 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -30 +31