Merge tag 'for-5.18/drivers-2022-04-01' of git://git.kernel.dk/linux-block

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

diff --git a/mm/Kconfig b/mm/Kconfig
index c349599..034d879 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -249,6 +249,9 @@ config MIGRATION
          pages as migration can relocate pages to satisfy a huge page
          allocation instead of reclaiming.
 
+config DEVICE_MIGRATION
+       def_bool MIGRATION && ZONE_DEVICE
+
 config ARCH_ENABLE_HUGEPAGE_MIGRATION
        bool
 
@@ -262,6 +265,9 @@ config HUGETLB_PAGE_SIZE_VARIABLE
          HUGETLB_PAGE_ORDER when there are multiple HugeTLB page sizes available
          on a platform.
 
+         Note that the pageblock_order cannot exceed MAX_ORDER - 1 and will be
+         clamped down to MAX_ORDER - 1.
+
 config CONTIG_ALLOC
        def_bool (MEMORY_ISOLATION && COMPACTION) || CMA
 
@@ -411,6 +417,9 @@ choice
          benefit.
 endchoice
 
+config ARCH_WANT_GENERAL_HUGETLB
+       bool
+
 config ARCH_WANTS_THP_SWAP
        def_bool n
 
@@ -753,6 +762,9 @@ config ARCH_HAS_CURRENT_STACK_POINTER
          register alias named "current_stack_pointer", this config can be
          selected.
 
+config ARCH_HAS_FILTER_PGPROT
+       bool
+
 config ARCH_HAS_PTE_DEVMAP
        bool
 
@@ -785,9 +797,6 @@ config ZONE_DEVICE
 
          If FS_DAX is enabled, then say Y.
 
-config DEV_PAGEMAP_OPS
-       bool
-
 #
 # Helpers to mirror range of the CPU page tables of a process into device page
 # tables.
@@ -799,7 +808,6 @@ config HMM_MIRROR
 config DEVICE_PRIVATE
        bool "Unaddressable device memory (GPU memory, ...)"
        depends on ZONE_DEVICE
-       select DEV_PAGEMAP_OPS
 
        help
          Allows creation of struct pages to represent unaddressable device