tracehook: exit

[linux-2.6] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 3aa819d628c112cc185f9545c7ae5e3fb8a5c310..efee5d379df4adb74afba4bbc83118a64f0a9767 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -77,6 +77,9 @@ config FLAT_NODE_MEM_MAP
        def_bool y
        depends on !SPARSEMEM
 
        def_bool y
        depends on !SPARSEMEM
 

+config HAVE_GET_USER_PAGES_FAST
+       bool
+

 #
 # Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's
 # to represent different areas of memory.  This variable allows
 #
 # Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's
 # to represent different areas of memory.  This variable allows


@@ -129,7 +132,7 @@ config MEMORY_HOTPLUG
        bool "Allow for memory hot-add"
        depends on SPARSEMEM || X86_64_ACPI_NUMA
        depends on HOTPLUG && !HIBERNATION && ARCH_ENABLE_MEMORY_HOTPLUG
        bool "Allow for memory hot-add"
        depends on SPARSEMEM || X86_64_ACPI_NUMA
        depends on HOTPLUG && !HIBERNATION && ARCH_ENABLE_MEMORY_HOTPLUG

-       depends on (IA64 || X86 || PPC64 || SUPERH)
+       depends on (IA64 || X86 || PPC64 || SUPERH || S390)

 
 comment "Memory hotplug is currently incompatible with Software Suspend"
        depends on SPARSEMEM && HOTPLUG && HIBERNATION
 
 comment "Memory hotplug is currently incompatible with Software Suspend"
        depends on SPARSEMEM && HOTPLUG && HIBERNATION


@@ -174,7 +177,7 @@ config SPLIT_PTLOCK_CPUS
 config MIGRATION
        bool "Page migration"
        def_bool y
 config MIGRATION
        bool "Page migration"
        def_bool y

-       depends on NUMA
+       depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE

        help
          Allows the migration of the physical location of pages of processes
          while the virtual addresses are not changed. This is useful for
        help
          Allows the migration of the physical location of pages of processes
          while the virtual addresses are not changed. This is useful for


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

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

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