sparsemem: on no vmemmap path put mem_map on node high too

[safe/jmp/linux-2.6] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 77b4980..9c61158 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -115,6 +115,10 @@ config SPARSEMEM_EXTREME
 config SPARSEMEM_VMEMMAP_ENABLE
        bool
 
 config SPARSEMEM_VMEMMAP_ENABLE
        bool
 

+config SPARSEMEM_ALLOC_MEM_MAP_TOGETHER
+       def_bool y
+       depends on SPARSEMEM && X86_64
+

 config SPARSEMEM_VMEMMAP
        bool "Sparse Memory virtual memmap"
        depends on SPARSEMEM && SPARSEMEM_VMEMMAP_ENABLE
 config SPARSEMEM_VMEMMAP
        bool "Sparse Memory virtual memmap"
        depends on SPARSEMEM && SPARSEMEM_VMEMMAP_ENABLE


@@ -158,11 +162,13 @@ config PAGEFLAGS_EXTENDED
 # Default to 4 for wider testing, though 8 might be more appropriate.
 # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
 # PA-RISC 7xxx's spinlock_t would enlarge struct page from 32 to 44 bytes.
 # Default to 4 for wider testing, though 8 might be more appropriate.
 # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
 # PA-RISC 7xxx's spinlock_t would enlarge struct page from 32 to 44 bytes.

+# DEBUG_SPINLOCK and DEBUG_LOCK_ALLOC spinlock_t also enlarge struct page.

 #
 config SPLIT_PTLOCK_CPUS
        int
 #
 config SPLIT_PTLOCK_CPUS
        int

-       default "4096" if ARM && !CPU_CACHE_VIPT
-       default "4096" if PARISC && !PA20
+       default "999999" if ARM && !CPU_CACHE_VIPT
+       default "999999" if PARISC && !PA20
+       default "999999" if DEBUG_SPINLOCK || DEBUG_LOCK_ALLOC

        default "4"
 
 #
        default "4"
 
 #


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

-       default "2" if SUPERH || AVR32
+       default "2" if AVR32

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


@@ -210,7 +216,7 @@ config KSM
          Enable Kernel Samepage Merging: KSM periodically scans those areas
          of an application's address space that an app has advised may be
          mergeable.  When it finds pages of identical content, it replaces
          Enable Kernel Samepage Merging: KSM periodically scans those areas
          of an application's address space that an app has advised may be
          mergeable.  When it finds pages of identical content, it replaces

-         the many instances by a single resident page with that content, so
+         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
          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


@@ -219,6 +225,7 @@ config KSM
 
 config DEFAULT_MMAP_MIN_ADDR
         int "Low address space to protect from user allocation"
 
 config DEFAULT_MMAP_MIN_ADDR
         int "Low address space to protect from user allocation"

+       depends on MMU

         default 4096
         help
          This is the portion of low virtual memory which should be protected
         default 4096
         help
          This is the portion of low virtual memory which should be protected


@@ -249,8 +256,9 @@ config MEMORY_FAILURE
          special hardware support and typically ECC memory.
 
 config HWPOISON_INJECT
          special hardware support and typically ECC memory.
 
 config HWPOISON_INJECT

-       tristate "Poison pages injector"
-       depends on MEMORY_FAILURE && DEBUG_KERNEL
+       tristate "HWPoison pages injector"
+       depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
+       select PROC_PAGE_MONITOR

 
 config NOMMU_INITIAL_TRIM_EXCESS
        int "Turn on mmap() excess space trimming before booting"
 
 config NOMMU_INITIAL_TRIM_EXCESS
        int "Turn on mmap() excess space trimming before booting"