mm: do not call do_fault_around for non-linear fault

[karo-tx-linux.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 1b5a95f0fa013ca428e877ae39d6f0148a49cd61..3e9977a9d657dd0df323488a6f47e0ba1f23e6f8 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -134,6 +134,9 @@ config HAVE_MEMBLOCK
 config HAVE_MEMBLOCK_NODE_MAP
        boolean
 
+config HAVE_MEMBLOCK_PHYS_MAP
+       boolean
+
 config ARCH_DISCARD_MEMBLOCK
        boolean
 
@@ -264,6 +267,9 @@ config MIGRATION
          pages as migration can relocate pages to satisfy a huge page
          allocation instead of reclaiming.
 
+config ARCH_ENABLE_HUGEPAGE_MIGRATION
+       boolean
+
 config PHYS_ADDR_T_64BIT
        def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT
 
@@ -430,16 +436,6 @@ 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
 #
@@ -555,7 +551,7 @@ config MEM_SOFT_DIRTY
          See Documentation/vm/soft-dirty.txt for more details.
 
 config ZSMALLOC
-       bool "Memory allocator for compressed pages"
+       tristate "Memory allocator for compressed pages"
        depends on MMU
        default n
        help