Signed-off-by: Dave Hansen --- memhotplug-dave/init/Kconfig | 3 +++ memhotplug-dave/mm/Kconfig | 3 +++ 2 files changed, 6 insertions(+) diff -puN mm/Kconfig~P07.2-memory_migration-depends-swap mm/Kconfig --- memhotplug/mm/Kconfig~P07.2-memory_migration-depends-swap 2004-12-10 13:53:06.000000000 -0800 +++ memhotplug-dave/mm/Kconfig 2004-12-10 13:53:06.000000000 -0800 @@ -16,6 +16,9 @@ config MEMORY_HOTPLUG select MEMORY_MIGRATE config MEMORY_MIGRATE + select SWAP bool "Memory migration" default y if MEMORY_HOTPLUG +comment "Selecting Memory Migration automatically enables CONFIG_SWAP" + depends on !SWAP diff -puN init/Kconfig~P07.2-memory_migration-depends-swap init/Kconfig --- memhotplug/init/Kconfig~P07.2-memory_migration-depends-swap 2004-12-10 13:53:06.000000000 -0800 +++ memhotplug-dave/init/Kconfig 2004-12-10 13:53:06.000000000 -0800 @@ -79,6 +79,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 _