diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2017-07-30 09:52:43 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2017-08-11 08:37:12 -0400 |
| commit | d1d51e73b5abeb2bf0aab53a8eb288300a9ee9c7 (patch) | |
| tree | cb89aa51099412e4cf63721783c3de19a26a18e7 | |
| parent | 09179817b637d651398bbe275109102221c8235d (diff) | |
| download | kernel-d1d51e73b5abeb2bf0aab53a8eb288300a9ee9c7.tar.gz kernel-d1d51e73b5abeb2bf0aab53a8eb288300a9ee9c7.tar.xz kernel-d1d51e73b5abeb2bf0aab53a8eb288300a9ee9c7.zip | |
Disable MEMORY_HOTPLUG_DEFAULT_ONLINE on ppc64 (rhbz 1476380)
| -rw-r--r-- | baseconfig/powerpc/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE | 2 | ||||
| -rw-r--r-- | kernel-ppc64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64p7-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64p7.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
8 files changed, 10 insertions, 7 deletions
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 0efb78243..dbbef398a 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 429d4bd18..b9e46b29c 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 44f1fee89..2300ca5d2 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 37b50330e..e4d75424a 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 8e2362aa5..ff0fa81e5 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 4bd445dce..362af9009 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 5b1b29dc9..701cc798b 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 |