[kernel] Disable memory hotplug on x86-64

[Dave Jones]

commit 2ee9f1482920f6d831eb6d70458bd0988394982b
Author: Dave Jones <davej at redhat.com>
Date:   Fri Jan 13 17:33:51 2012 -0500

    Disable memory hotplug on x86-64

 config-x86_64-generic |    4 ++--
 kernel.spec           |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 85aaae8..02b440d 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -65,8 +65,8 @@ CONFIG_SPARSEMEM=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTREMOVE=y
+# CONFIG_MEMORY_HOTPLUG is not set
+# CONFIG_MEMORY_HOTREMOVE is not set
 
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_RZ1000 is not set
diff --git a/kernel.spec b/kernel.spec
index 62a3932..cdba17a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2318,6 +2318,9 @@ fi
 #                 ||     ||
 %changelog
 * Fri Jan 13 2012 Dave Jones <davej at redhat.com>
+- Disable memory hotplug on x86-64
+
+* Fri Jan 13 2012 Dave Jones <davej at redhat.com>
 - Disable Calgary IOMMU
 
 * Fri Jan 13 2012 Dave Jones <davej at redhat.com>