Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[linux-2.6-microblaze.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index d5004d8..ce95491 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -266,7 +266,7 @@ config ARCH_ENABLE_THP_MIGRATION
        bool
 
 config PHYS_ADDR_T_64BIT
        bool
 
 config PHYS_ADDR_T_64BIT

-       def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT
+       def_bool 64BIT

 
 config BOUNCE
        bool "Enable bounce buffers"
 
 config BOUNCE
        bool "Enable bounce buffers"


@@ -305,7 +305,7 @@ config KSM
          the many instances by a single page with that content, so
          saving memory until one or another app needs to modify the content.
          Recommended for use with KVM, or with other duplicative applications.
          the many instances by a single page with that content, so
          saving memory until one or another app needs to modify the content.
          Recommended for use with KVM, or with other duplicative applications.

-         See Documentation/vm/ksm.txt for more information: KSM is inactive
+         See Documentation/vm/ksm.rst for more information: KSM is inactive

          until a program has madvised that an area is MADV_MERGEABLE, and
          root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
 
          until a program has madvised that an area is MADV_MERGEABLE, and
          root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
 


@@ -530,7 +530,7 @@ config MEM_SOFT_DIRTY
          into a page just as regular dirty bit, but unlike the latter
          it can be cleared by hands.
 
          into a page just as regular dirty bit, but unlike the latter
          it can be cleared by hands.
 

-         See Documentation/vm/soft-dirty.txt for more details.
+         See Documentation/admin-guide/mm/soft-dirty.rst for more details.

 
 config ZSWAP
        bool "Compressed cache for swap pages (EXPERIMENTAL)"
 
 config ZSWAP
        bool "Compressed cache for swap pages (EXPERIMENTAL)"


@@ -636,6 +636,7 @@ config DEFERRED_STRUCT_PAGE_INIT
        default n
        depends on NO_BOOTMEM
        depends on !FLATMEM
        default n
        depends on NO_BOOTMEM
        depends on !FLATMEM

+       depends on !NEED_PER_CPU_KM

        help
          Ordinarily all struct pages are initialised during early boot in a
          single thread. On very large machines this can take a considerable
        help
          Ordinarily all struct pages are initialised during early boot in a
          single thread. On very large machines this can take a considerable


@@ -656,7 +657,8 @@ config IDLE_PAGE_TRACKING
          be useful to tune memory cgroup limits and/or for job placement
          within a compute cluster.
 
          be useful to tune memory cgroup limits and/or for job placement
          within a compute cluster.
 

-         See Documentation/vm/idle_page_tracking.txt for more details.
+         See Documentation/admin-guide/mm/idle_page_tracking.rst for
+         more details.

 
 # arch_add_memory() comprehends device memory
 config ARCH_HAS_ZONE_DEVICE
 
 # arch_add_memory() comprehends device memory
 config ARCH_HAS_ZONE_DEVICE


@@ -692,6 +694,9 @@ config ARCH_HAS_HMM
 config MIGRATE_VMA_HELPER
        bool
 
 config MIGRATE_VMA_HELPER
        bool
 

+config DEV_PAGEMAP_OPS
+       bool
+

 config HMM
        bool
        select MIGRATE_VMA_HELPER
 config HMM
        bool
        select MIGRATE_VMA_HELPER


@@ -712,6 +717,7 @@ config DEVICE_PRIVATE
        bool "Unaddressable device memory (GPU memory, ...)"
        depends on ARCH_HAS_HMM
        select HMM
        bool "Unaddressable device memory (GPU memory, ...)"
        depends on ARCH_HAS_HMM
        select HMM

+       select DEV_PAGEMAP_OPS

 
        help
          Allows creation of struct pages to represent unaddressable device
 
        help
          Allows creation of struct pages to represent unaddressable device


@@ -722,6 +728,7 @@ config DEVICE_PUBLIC
        bool "Addressable device memory (like GPU memory)"
        depends on ARCH_HAS_HMM
        select HMM
        bool "Addressable device memory (like GPU memory)"
        depends on ARCH_HAS_HMM
        select HMM

+       select DEV_PAGEMAP_OPS

 
        help
          Allows creation of struct pages to represent addressable device
 
        help
          Allows creation of struct pages to represent addressable device


@@ -752,3 +759,6 @@ config GUP_BENCHMARK
          performance of get_user_pages_fast().
 
          See tools/testing/selftests/vm/gup_benchmark.c
          performance of get_user_pages_fast().
 
          See tools/testing/selftests/vm/gup_benchmark.c

+
+config ARCH_HAS_PTE_SPECIAL
+       bool