X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mm%2FKconfig;h=0873998d14961dda4d720de85d00c611fd2f0387;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=ab1007556cdf1d8a3afcb3064894aa4710df5f9f;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/mm/Kconfig b/mm/Kconfig
index ab1007556..0873998d1 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -126,26 +126,16 @@ comment "Memory hotplug is currently incompatible with Software Suspend"
 # Default to 4 for wider testing, though 8 might be more appropriate.
 # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
 # PA-RISC 7xxx's spinlock_t would enlarge struct page from 32 to 44 bytes.
-# XEN on x86 architecture uses the mapping field on pagetable pages to store a
-# pointer to the destructor. This conflicts with pte_lock_deinit().
 #
 config SPLIT_PTLOCK_CPUS
 	int
 	default "4096" if ARM && !CPU_CACHE_VIPT
 	default "4096" if PARISC && !PA20
-	default "4096" if X86_XEN || X86_64_XEN
-	default "4096" if !64BIT
 	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