X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mm%2FKconfig;h=332f5c29b53a3c04665e4d727fc50dbfde609fb2;hb=cfd95a9cf58cd9e92d4c23b5ee20b07a3d121477;hp=21eb51d4da8fde9e987f22618bbdd609a8065116;hpb=be37bdbce7ceaacf4f20c6cc759efbe75ebd1196;p=~andy%2Flinux

diff --git a/mm/Kconfig b/mm/Kconfig
index 21eb51d4da8..332f5c29b53 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -11,7 +11,7 @@ choice
 
 config FLATMEM_MANUAL
 	bool "Flat Memory"
-	depends on !ARCH_DISCONTIGMEM_ENABLE || ARCH_FLATMEM_ENABLE
+	depends on !(ARCH_DISCONTIGMEM_ENABLE || ARCH_SPARSEMEM_ENABLE) || ARCH_FLATMEM_ENABLE
 	help
 	  This option allows you to change some of the ways that
 	  Linux manages its memory internally.  Most users will
@@ -132,3 +132,16 @@ config SPLIT_PTLOCK_CPUS
 	default "4096" if ARM && !CPU_CACHE_VIPT
 	default "4096" if PARISC && !PA20
 	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.