ARM: perf: fix group validation for mixed software and hardware groups

[~andy/linux] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 6cdd27043303e7473925bbc04778a43481dc2205..026771a9b0976068f64935b60c9da8526dbe7b63 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -245,7 +245,7 @@ config COMPACTION
 config MIGRATION
        bool "Page migration"
        def_bool y
 config MIGRATION
        bool "Page migration"
        def_bool y

-       depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION || CMA
+       depends on (NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION || CMA) && MMU

        help
          Allows the migration of the physical location of pages of processes
          while the virtual addresses are not changed. This is useful in
        help
          Allows the migration of the physical location of pages of processes
          while the virtual addresses are not changed. This is useful in


@@ -480,7 +480,7 @@ config FRONTSWAP
 
 config CMA
        bool "Contiguous Memory Allocator"
 
 config CMA
        bool "Contiguous Memory Allocator"

-       depends on HAVE_MEMBLOCK
+       depends on HAVE_MEMBLOCK && MMU

        select MIGRATION
        select MEMORY_ISOLATION
        help
        select MIGRATION
        select MEMORY_ISOLATION
        help