security: filesystem capabilities refactor kernel code

[linux-2.6] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 3aa819d628c112cc185f9545c7ae5e3fb8a5c310..aa799007a11b3bc6bfb3817a584ddce683e0c2b7 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -129,7 +129,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 +174,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 +199,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