diff --git a/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE b/baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE index bbbf7d364..e7fe50c39 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 5c3acbfc6..d80495c4b 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -2655,7 +2655,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 e67962c51..1dcddf1db 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2634,7 +2634,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 a1b849a01..4eaa46bb7 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2601,7 +2601,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 56e21d7cf..dbff9c86e 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2580,7 +2580,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 7d64e1799..32a7a7e94 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -2600,7 +2600,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 06a307397..d822da858 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -2579,7 +2579,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 0d4956274..23e210916 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2254,6 +2254,9 @@ fi # # %changelog +* Fri Aug 11 2017 Josh Boyer +- Disable MEMORY_HOTPLUG_DEFAULT_ONLINE on ppc64 (rhbz 1476380) + * Mon Aug 07 2017 Justin M. Forbes - 4.12.5-300 - Linux v4.12.5 - Fixes CVE-2017-7533 (rhbz 1468283 1478086)