ARM: OMAP3: Fix omap3_l3_block_irq warning when CONFIG_BUG is not set

[firefly-linux-kernel-4.4.55.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index e338407f1225f0873a8eb20761c86fd82db1dfc0..b2176374b98e5e678ec93acda28cc0891d1c3717 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -198,7 +198,7 @@ config COMPACTION
 config MIGRATION
        bool "Page migration"
        def_bool y
-       depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION
+       depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION || CMA
        help
          Allows the migration of the physical location of pages of processes
          while the virtual addresses are not changed. This is useful in
@@ -349,6 +349,16 @@ choice
          benefit.
 endchoice
 
+config CROSS_MEMORY_ATTACH
+       bool "Cross Memory Support"
+       depends on MMU
+       default y
+       help
+         Enabling this option adds the system calls process_vm_readv and
+         process_vm_writev which allow a process with the correct privileges
+         to directly read from or write to to another process's address space.
+         See the man page for more details.
+
 #
 # UP and nommu archs use km based percpu allocator
 #