net-ipv6: Fix alleged compiler warning in ipv6_exthdrs_len()

[~andy/linux] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index c28d247e524abc9581001fd4c52295570a37d3c6..eb69f352401de910552fb7f28959b38f4746a878 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -20,7 +20,7 @@ config FLATMEM_MANUAL
 
          Some users of more advanced features like NUMA and
          memory hotplug may have different options here.
 
          Some users of more advanced features like NUMA and
          memory hotplug may have different options here.

-         DISCONTIGMEM is an more mature, better tested system,
+         DISCONTIGMEM is a more mature, better tested system,

          but is incompatible with memory hotplug and may suffer
          decreased performance over SPARSEMEM.  If unsure between
          "Sparse Memory" and "Discontiguous Memory", choose
          but is incompatible with memory hotplug and may suffer
          decreased performance over SPARSEMEM.  If unsure between
          "Sparse Memory" and "Discontiguous Memory", choose


@@ -218,10 +218,11 @@ config SPLIT_PTLOCK_CPUS
        int
        default "999999" if ARM && !CPU_CACHE_VIPT
        default "999999" if PARISC && !PA20
        int
        default "999999" if ARM && !CPU_CACHE_VIPT
        default "999999" if PARISC && !PA20

-       default "999999" if DEBUG_SPINLOCK || DEBUG_LOCK_ALLOC
-       default "999999" if !64BIT && GENERIC_LOCKBREAK

        default "4"
 
        default "4"
 

+config ARCH_ENABLE_SPLIT_PMD_PTLOCK
+       boolean
+

 #
 # support for memory balloon compaction
 config BALLOON_COMPACTION
 #
 # support for memory balloon compaction
 config BALLOON_COMPACTION