Since the swap code is utilized so heavily for memory migration force the config option on. Signed-off-by: Dave Hansen --- memhotplug-dave/init/Kconfig | 3 +++ memhotplug-dave/mm/Kconfig | 14 ++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff -puN init/Kconfig~AA-PM-07.2-memory_migration-depends-swap init/Kconfig --- memhotplug/init/Kconfig~AA-PM-07.2-memory_migration-depends-swap 2005-07-28 13:50:36.000000000 -0700 +++ memhotplug-dave/init/Kconfig 2005-07-28 13:50:36.000000000 -0700 @@ -87,6 +87,9 @@ config SWAP used to provide more virtual memory than the actual RAM present in your computer. If unsure say Y. +comment " Swap automatically enabled by selecting Memory Migration" + depends on MEMORY_MIGRATE + config SYSVIPC bool "System V IPC" depends on MMU diff -puN mm/Kconfig~AA-PM-07.2-memory_migration-depends-swap mm/Kconfig --- memhotplug/mm/Kconfig~AA-PM-07.2-memory_migration-depends-swap 2005-07-28 13:50:36.000000000 -0700 +++ memhotplug-dave/mm/Kconfig 2005-07-28 13:50:36.000000000 -0700 @@ -119,20 +119,14 @@ config MEMORY_HOTPLUG comment "Memory hotplug is currently incompatible with Software Suspend" depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND -*************** -*** 110,112 **** - config MEMORY_MIGRATE - select SWAP - bool "Memory migration" ---- 110,120 ---- - 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) + default y if MEMORY_HOTPLUG 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 _