diff --git a/config-x86_64-generic b/config-x86_64-generic index efd3d9efd..9588c1b64 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -93,7 +93,8 @@ CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP=y # CONFIG_MOVABLE_NODE is not set -# CONFIG_MEMORY_HOTPLUG is not set +# CONFIG_ARCH_MEMORY_PROBE is not set +CONFIG_MEMORY_HOTPLUG=y # CONFIG_MEMORY_HOTREMOVE is not set # CONFIG_BLK_DEV_CMD640 is not set diff --git a/kernel.spec b/kernel.spec index 7a2fa0bb7..25c09cd45 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2317,6 +2317,9 @@ fi # and build. %changelog +* Wed Apr 30 2014 Josh Boyer +- Enable CONFIG_MEMORY_HOTPLUG (rhbz 1092948) + * Fri Apr 25 2014 Hans de Goede - Add synaptics min-max quirk for ThinkPad Edge E431 (rhbz#1089689)