m68k: enable CONFIG_COMPAT_BRK by default

[linux-2.6-omap-h63xx.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 1cc6cada2bbfa837ed0f37ec292f4657125cec68..3aa819d628c112cc185f9545c7ae5e3fb8a5c310 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -37,7 +37,7 @@ config DISCONTIGMEM_MANUAL
          in their physical address spaces, and this option provides
          more efficient handling of these holes.  However, the vast
          majority of hardware has quite flat address spaces, and
          in their physical address spaces, and this option provides
          more efficient handling of these holes.  However, the vast
          majority of hardware has quite flat address spaces, and

-         can have degraded performance from extra overhead that
+         can have degraded performance from the extra overhead that

          this option imposes.
 
          Many NUMA configurations will have this as the only option.
          this option imposes.
 
          Many NUMA configurations will have this as the only option.


@@ -112,18 +112,17 @@ config SPARSEMEM_EXTREME
        def_bool y
        depends on SPARSEMEM && !SPARSEMEM_STATIC
 
        def_bool y
        depends on SPARSEMEM && !SPARSEMEM_STATIC
 

-#
-# SPARSEMEM_VMEMMAP uses a virtually mapped mem_map to optimise pfn_to_page
-# and page_to_pfn.  The most efficient option where kernel virtual space is
-# not under pressure.
-#

 config SPARSEMEM_VMEMMAP_ENABLE
        def_bool n
 
 config SPARSEMEM_VMEMMAP
 config SPARSEMEM_VMEMMAP_ENABLE
        def_bool n
 
 config SPARSEMEM_VMEMMAP

-       bool
-       depends on SPARSEMEM
-       default y if (SPARSEMEM_VMEMMAP_ENABLE)
+       bool "Sparse Memory virtual memmap"
+       depends on SPARSEMEM && SPARSEMEM_VMEMMAP_ENABLE
+       default y
+       help
+        SPARSEMEM_VMEMMAP uses a virtually mapped memmap to optimise
+        pfn_to_page and page_to_pfn operations.  This is the most
+        efficient option when sufficient kernel resources are available.

 
 # eventually, we can have this option just 'select SPARSEMEM'
 config MEMORY_HOTPLUG
 
 # eventually, we can have this option just 'select SPARSEMEM'
 config MEMORY_HOTPLUG


@@ -144,6 +143,18 @@ config MEMORY_HOTREMOVE
        depends on MEMORY_HOTPLUG && ARCH_ENABLE_MEMORY_HOTREMOVE
        depends on MIGRATION
 
        depends on MEMORY_HOTPLUG && ARCH_ENABLE_MEMORY_HOTREMOVE
        depends on MIGRATION
 

+#
+# If we have space for more page flags then we can enable additional
+# optimizations and functionality.
+#
+# Regular Sparsemem takes page flag bits for the sectionid if it does not
+# use a virtual memmap. Disable extended page flags for 32 bit platforms
+# that require the use of a sectionid in the page flags.
+#
+config PAGEFLAGS_EXTENDED
+       def_bool y
+       depends on 64BIT || SPARSEMEM_VMEMMAP || !NUMA || !SPARSEMEM
+

 # 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.
 # 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.


@@ -155,7 +166,6 @@ config SPLIT_PTLOCK_CPUS
        int
        default "4096" if ARM && !CPU_CACHE_VIPT
        default "4096" if PARISC && !PA20
        int
        default "4096" if ARM && !CPU_CACHE_VIPT
        default "4096" if PARISC && !PA20

-       default "4096" if XEN

        default "4"
 
 #
        default "4"
 
 #


@@ -189,7 +199,7 @@ config BOUNCE
 config NR_QUICK
        int
        depends on QUICKLIST
 config NR_QUICK
        int
        depends on QUICKLIST

-       default "2" if (SUPERH && !SUPERH64)
+       default "2" if SUPERH

        default "1"
 
 config VIRT_TO_BUS
        default "1"
 
 config VIRT_TO_BUS