tcp: enforce tcp_min_snd_mss in tcp_mtu_probing()

[pandora-kernel.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 011b110..cc47f36 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -192,7 +192,7 @@ config COMPACTION
 config MIGRATION
        bool "Page migration"
        def_bool y
 config MIGRATION
        bool "Page migration"
        def_bool y

-       depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION
+       depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION || CMA

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


@@ -307,7 +307,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
 
 config TRANSPARENT_HUGEPAGE
        bool "Transparent Hugepage Support"
 
 config TRANSPARENT_HUGEPAGE
        bool "Transparent Hugepage Support"

-       depends on X86 && MMU
+       depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE

        select COMPACTION
        help
          Transparent Hugepages allows the kernel to use huge pages and
        select COMPACTION
        help
          Transparent Hugepages allows the kernel to use huge pages and