Merge branch 'late/board' into devel-late

[pandora-kernel.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index e338407..b217637 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -198,7 +198,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
+       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
        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
 
          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
 #
 #
 # UP and nommu archs use km based percpu allocator
 #