diff options
| -rw-r--r-- | config-x86_64-generic | 3 | ||||
| -rw-r--r-- | kernel.spec | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index 99205710e..de4b762ef 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -89,7 +89,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_MEMORY_HOTPLUG=y +# CONFIG_ARCH_MEMORY_PROBE is not set # CONFIG_MEMORY_HOTREMOVE is not set # CONFIG_BLK_DEV_CMD640 is not set diff --git a/kernel.spec b/kernel.spec index b716a4cdd..3f991ebc1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2190,6 +2190,7 @@ fi # || || %changelog * Wed Dec 18 2013 Josh Boyer <jwboyer@fedoraproject.org> +- Reenable MEMORY_HOTPLUG on x86_64 - Fix nowatchdog-on-virt.patch to actually work in KVM guests * Tue Dec 17 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc4.git1.1 |