From d1d51e73b5abeb2bf0aab53a8eb288300a9ee9c7 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Aug 11 2017 12:37:12 +0000
Subject: Disable MEMORY_HOTPLUG_DEFAULT_ONLINE on ppc64 (rhbz 1476380)


---

diff --git a/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE b/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
index bbbf7d3..e7fe50c 100644
--- a/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
+++ b/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
@@ -1 +1 @@
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 0efb782..dbbef39 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2685,7 +2685,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG=y
 CONFIG_MEMORY_FAILURE=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 429d4bd..b9e46b2 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2664,7 +2664,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG=y
 CONFIG_MEMORY_FAILURE=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 44f1fee..2300ca5 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2631,7 +2631,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG=y
 CONFIG_MEMORY_FAILURE=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 37b5033..e4d7542 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2610,7 +2610,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG=y
 CONFIG_MEMORY_FAILURE=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 8e2362a..ff0fa81 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -2630,7 +2630,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG=y
 CONFIG_MEMORY_FAILURE=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 4bd445d..362af90 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -2609,7 +2609,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG=y
 CONFIG_MEMORY_FAILURE=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY is not set
diff --git a/kernel.spec b/kernel.spec
index 5b1b29d..701cc79 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2196,6 +2196,9 @@ fi
 #
 #
 %changelog
+* Fri Aug 11 2017 Josh Boyer <jwboyer@fedoraproject.org>
+- Disable MEMORY_HOTPLUG_DEFAULT_ONLINE on ppc64 (rhbz 1476380)
+
 * Thu Aug 10 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc4.git3.1
 - Linux v4.13-rc4-139-g8d31f80eb388