tools headers UAPI: Sync linux/prctl.h with the kernel sources

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

diff --git a/mm/Kconfig b/mm/Kconfig
index d0808a2..02d44e3 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -9,7 +9,6 @@ config SELECT_MEMORY_MODEL
 choice
        prompt "Memory model"
        depends on SELECT_MEMORY_MODEL
-       default DISCONTIGMEM_MANUAL if ARCH_DISCONTIGMEM_DEFAULT
        default SPARSEMEM_MANUAL if ARCH_SPARSEMEM_DEFAULT
        default FLATMEM_MANUAL
        help
@@ -149,6 +148,9 @@ config MEMORY_ISOLATION
 config HAVE_BOOTMEM_INFO_NODE
        def_bool n
 
+config ARCH_ENABLE_MEMORY_HOTPLUG
+       bool
+
 # eventually, we can have this option just 'select SPARSEMEM'
 config MEMORY_HOTPLUG
        bool "Allow for memory hot-add"
@@ -177,12 +179,20 @@ config MEMORY_HOTPLUG_DEFAULT_ONLINE
          Say N here if you want the default policy to keep all hot-plugged
          memory blocks in 'offline' state.
 
+config ARCH_ENABLE_MEMORY_HOTREMOVE
+       bool
+
 config MEMORY_HOTREMOVE
        bool "Allow for memory hot remove"
        select HAVE_BOOTMEM_INFO_NODE if (X86_64 || PPC64)
        depends on MEMORY_HOTPLUG && ARCH_ENABLE_MEMORY_HOTREMOVE
        depends on MIGRATION
 
+config MHP_MEMMAP_ON_MEMORY
+       def_bool y
+       depends on MEMORY_HOTPLUG && SPARSEMEM_VMEMMAP
+       depends on ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
+
 # Heavily threaded applications may benefit from splitting the mm-wide
 # page_table_lock, so that faults on different parts of the user address
 # space can be handled with less contention: split it at this NR_CPUS.
@@ -274,6 +284,13 @@ config ARCH_ENABLE_HUGEPAGE_MIGRATION
 config ARCH_ENABLE_THP_MIGRATION
        bool
 
+config HUGETLB_PAGE_SIZE_VARIABLE
+       def_bool n
+       help
+         Allows the pageblock_order value to be dynamic instead of just standard
+         HUGETLB_PAGE_ORDER when there are multiple HugeTLB page sizes available
+         on a platform.
+
 config CONTIG_ALLOC
        def_bool (MEMORY_ISOLATION && COMPACTION) || CMA
 
@@ -512,6 +529,13 @@ config CMA_DEBUGFS
        help
          Turns on the DebugFS interface for CMA.
 
+config CMA_SYSFS
+       bool "CMA information through sysfs interface"
+       depends on CMA && SYSFS
+       help
+         This option exposes some sysfs attributes to get information
+         from CMA.
+
 config CMA_AREAS
        int "Maximum count of the CMA areas"
        depends on CMA
@@ -759,6 +783,9 @@ config IDLE_PAGE_TRACKING
          See Documentation/admin-guide/mm/idle_page_tracking.rst for
          more details.
 
+config ARCH_HAS_CACHE_LINE_SIZE
+       bool
+
 config ARCH_HAS_PTE_DEVMAP
        bool
 
@@ -871,4 +898,7 @@ config MAPPING_DIRTY_HELPERS
 config KMAP_LOCAL
        bool
 
+# struct io_mapping based helper.  Selected by drivers that need them
+config IO_MAPPING
+       bool
 endmenu