Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 memhotplug-dave/mm/Kconfig |   15 +++++++++++++++
 1 files changed, 15 insertions(+)

diff -puN mm/Kconfig~fudge-patch-2 mm/Kconfig
--- memhotplug/mm/Kconfig~fudge-patch-2	2005-03-28 16:38:56.000000000 -0800
+++ memhotplug-dave/mm/Kconfig	2005-03-28 16:38:56.000000000 -0800
@@ -53,3 +53,18 @@ config NEED_MULTIPLE_NODES
 config HAVE_MEMORY_PRESENT
 	def_bool y
 	depends on ARCH_HAVE_MEMORY_PRESENT || SPARSEMEM
+
+config MEMORY_MIGRATE
+	select SWAP
+	bool "Memory migration"
+	default y if MEMORY_HOTPLUG
+
+config MEMORY_REMOVE
+	bool "Allow for memory hot-remove"
+	depends on MEMORY_HOTPLUG && MEMORY_MIGRATE && (X86 && !X86_64)
+	help
+	  Enabling this option allows you to hot-remove highmem zones
+	  on i386 systems.  The i386 depenence is a hack for now.
+
+comment "Selecting Memory Migration automatically enables CONFIG_SWAP"
+ 	depends on !SWAP
_