mm: simplify MEMORY_ISOLATION && COMPACTION || CMA into CONTIG_ALLOC

[sfrench/cifs-2.6.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index d85e39da47aed166d58f7bba669d60afb12bad59..137eadc18732ed0370618d24fe23c91f4f0e6574 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -258,6 +258,9 @@ config ARCH_ENABLE_HUGEPAGE_MIGRATION
 config ARCH_ENABLE_THP_MIGRATION
        bool
 
+config CONTIG_ALLOC
+       def_bool (MEMORY_ISOLATION && COMPACTION) || CMA
+
 config PHYS_ADDR_T_64BIT
        def_bool 64BIT
 
@@ -291,6 +294,7 @@ config MMU_NOTIFIER
 config KSM
        bool "Enable KSM for page merging"
        depends on MMU
+       select XXHASH
        help
          Enable Kernel Samepage Merging: KSM periodically scans those areas
          of an application's address space that an app has advised may be