From 6ca8cf0c9eebe1e27b957a7edaf0b548c9697b09 Mon Sep 17 00:00:00 2001 From: Jason Self Date: Sat, 2 Nov 2019 17:15:49 -0700 Subject: [PATCH] Disable memory hotplug for 4.9 on ppc64el for build error --- 4.9/ppc64el | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/4.9/ppc64el b/4.9/ppc64el index 5afe733..80b3485 100644 --- a/4.9/ppc64el +++ b/4.9/ppc64el @@ -512,7 +512,7 @@ CONFIG_IOMMU_HELPER=y CONFIG_SWIOTLB=y CONFIG_HOTPLUG_CPU=y CONFIG_ARCH_CPU_PROBE_RELEASE=y -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +# CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG is not set CONFIG_ARCH_HAS_WALK_MEMORY=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y @@ -542,11 +542,8 @@ CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_GENERIC_RCU_GUP=y CONFIG_NO_BOOTMEM=y CONFIG_MEMORY_ISOLATION=y -CONFIG_HAVE_BOOTMEM_INFO_NODE=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTPLUG_SPARSE=y -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y -CONFIG_MEMORY_HOTREMOVE=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +# CONFIG_MEMORY_HOTPLUG is not set CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MEMORY_BALLOON=y CONFIG_BALLOON_COMPACTION=y @@ -578,10 +575,8 @@ CONFIG_ZSMALLOC=y CONFIG_PGTABLE_MAPPING=y # CONFIG_ZSMALLOC_STAT is not set CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y -# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_IDLE_PAGE_TRACKING=y CONFIG_FRAME_VECTOR=y -CONFIG_ARCH_MEMORY_PROBE=y CONFIG_NODES_SPAN_OTHER_NODES=y # CONFIG_PPC_4K_PAGES is not set CONFIG_PPC_64K_PAGES=y @@ -7839,7 +7834,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_MEMORY_INIT is not set -CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m # CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_HAVE_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_STACKOVERFLOW is not set -- 2.31.1