[IPV4] fib_trie: removes a memset() call in tnode_new()

[linux-2.6] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index b0673066841223074db7e14c50b5a03db2de02a9..0016ebd4dcbac755450579197d317738727816a8 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


@@ -139,6 +138,11 @@ config MEMORY_HOTPLUG_SPARSE
        def_bool y
        depends on SPARSEMEM && MEMORY_HOTPLUG
 
        def_bool y
        depends on SPARSEMEM && MEMORY_HOTPLUG
 

+config MEMORY_HOTREMOVE
+       bool "Allow for memory hot remove"
+       depends on MEMORY_HOTPLUG && ARCH_ENABLE_MEMORY_HOTREMOVE
+       depends on MIGRATION
+

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


@@ -150,7 +154,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"
 
 #


@@ -184,7 +187,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