UBUNTU: [Config] CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=n for ppc64el

BugLink: http://bugs.launchpad.net/bugs/1709171
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
(cherry picked from artful commit 8f189e08c9a0719aa1e615fcb5380ecb9bf12e7f)
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index eeb9f34e50f863329fa8aa37d689518bbcb432c1..7176e15be9f9d121accc8cdeef4750c2d172dd3a 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -185,6 +185,7 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMSTICK=m
 CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_MFD_CORE=y

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 1c40b4f6ee553bb716a8641f6e138484183aae64..faf8c8a1248cbbe132c9c64276d241bb058ec563 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10239,10 +10239,12 @@ CONFIG_NUMA                                     note<LP:1543165 LP:1557690>
 
 # Menu: Processor type and features >> Allow for memory hot-add
 CONFIG_MEMORY_HOTPLUG                           policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE            policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE            policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'y'}>
 CONFIG_MEMORY_HOTREMOVE                         policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_DEFERRED_STRUCT_PAGE_INIT                policy<{'amd64': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 CONFIG_ZONE_DEVICE                              policy<{'amd64': 'y'}>
+#
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE            mark<ENFORCED> note<LP:1709171>
 
 # Menu: Processor type and features >> Architecture: arm
 CONFIG_HAVE_ARM_ARCH_TIMER                      policy<{'armhf': 'y'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1abde4a676e41bc66ac1c4aa194fa53cd28d8bf4..f35a86af8456fa02bca280529b9e29eab1511f5e 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4775,7 +4775,6 @@ CONFIG_MEMCG_SWAP=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_ISOLATION=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index b643ab7910d2787674abfbb3e88613894956dd5e..42167ca94e0793cae7731abf6effad3108eb1fc0 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -182,6 +182,7 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMSTICK=m
 CONFIG_MFD_CORE=y
 CONFIG_MFD_JANZ_CMODIO=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 9dee9c971980c12b7d14613c6233afe804abb095..87ed1e69b688e29e8702cebe04e823bbaa85cd88 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -186,6 +186,7 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEM_SOFT_DIRTY is not set
 CONFIG_MFD_CORE=y

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 6312b6e7835611bc1c17d13e17b68f7cbf2ffeb0..6626c85caca7df51834aab0566d6d0473370c127 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -164,6 +164,7 @@ CONFIG_MD_MULTIPATH=y
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_MEMORY is not set
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 # CONFIG_MEMSTICK is not set
 CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_MFD_CORE=m