linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 67b3f74..0873998 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -115,7 +115,7 @@ config SPARSEMEM_EXTREME
 # eventually, we can have this option just 'select SPARSEMEM'
 config MEMORY_HOTPLUG
        bool "Allow for memory hot-add"
-       depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND
+       depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG
 
 comment "Memory hotplug is currently incompatible with Software Suspend"
        depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND
@@ -131,17 +131,11 @@ config SPLIT_PTLOCK_CPUS
        int
        default "4096" if ARM && !CPU_CACHE_VIPT
        default "4096" if PARISC && !PA20
-       default "4096"
+       default "4"
 
 #
 # support for page migration
 #
 config MIGRATION
-       bool "Page migration"
-       def_bool y if NUMA
-       depends on SWAP && NUMA
-       help
-         Allows the migration of the physical location of pages of processes
-         while the virtual addresses are not changed. This is useful for
-         example on NUMA systems to put pages nearer to the processors accessing
-         the page.
+       def_bool y if NUMA || SPARSEMEM || DISCONTIGMEM
+       depends on SWAP