aboutsummaryrefslogtreecommitdiffstats
path: root/mm/Kconfig
diff options
context:
space:
mode:
authorChen Gang <gang.chen@asianux.com>2013-09-12 18:14:08 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-12 18:38:03 -0400
commitde32a8177f64bc62e1b19c685dd391af664ab13f (patch)
tree590cc9705947f1da9c9eb625122b03cc5e80f332 /mm/Kconfig
parent6072ddc8520b86adfac6939ca32fb6e6c4de017a (diff)
mm/Kconfig: add MMU dependency for MIGRATION.
MIGRATION must depend on MMU, or allmodconfig for the nommu sh architecture fails to build: CC mm/migrate.o mm/migrate.c: In function 'remove_migration_pte': mm/migrate.c:134:3: error: implicit declaration of function 'pmd_trans_huge' [-Werror=implicit-function-declaration] if (pmd_trans_huge(*pmd)) ^ mm/migrate.c:149:2: error: implicit declaration of function 'is_swap_pte' [-Werror=implicit-function-declaration] if (!is_swap_pte(pte)) ^ ... Also let CMA depend on MMU, or when NOMMU, if we select CMA, it will select MIGRATION by force. Signed-off-by: Chen Gang <gang.chen@asianux.com> Reviewed-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/Kconfig')
-rw-r--r--mm/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index 6cdd27043303..026771a9b097 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -245,7 +245,7 @@ config COMPACTION
245config MIGRATION 245config MIGRATION
246 bool "Page migration" 246 bool "Page migration"
247 def_bool y 247 def_bool y
248 depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION || CMA 248 depends on (NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION || CMA) && MMU
249 help 249 help
250 Allows the migration of the physical location of pages of processes 250 Allows the migration of the physical location of pages of processes
251 while the virtual addresses are not changed. This is useful in 251 while the virtual addresses are not changed. This is useful in
@@ -480,7 +480,7 @@ config FRONTSWAP
480 480
481config CMA 481config CMA
482 bool "Contiguous Memory Allocator" 482 bool "Contiguous Memory Allocator"
483 depends on HAVE_MEMBLOCK 483 depends on HAVE_MEMBLOCK && MMU
484 select MIGRATION 484 select MIGRATION
485 select MEMORY_ISOLATION 485 select MEMORY_ISOLATION
486 help 486 help